blob: 2f716bbe5493e0c2aecdc1143a61e3ce296b2591 [file] [log] [blame]
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +01001#!/bin/sh
2
3# Run all available tests (mostly).
4#
5# Warning: includes various build modes, so it will mess with the current
6# CMake configuration. After this script is run, the CMake cache is lost and
7# CMake is not initialised any more!
Manuel Pégourié-Gonnard3895f5a2014-03-27 14:44:04 +01008#
Manuel Pégourié-Gonnard392d3dd2015-01-26 14:03:56 +00009# Assumes gcc and clang (recent enough for using ASan with gcc and MemSan with
10# clang, or valgrind) are available, as well as cmake and a "good" find.
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +010011
12# Abort on errors (and uninitiliased variables)
13set -eu
14
15if [ -d library -a -d include -a -d tests ]; then :; else
Manuel Pégourié-Gonnarde4f6edc2015-01-22 16:43:54 +000016 echo "Must be run from mbed TLS root" >&2
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +010017 exit 1
18fi
19
Manuel Pégourié-Gonnard7f809972015-03-09 17:05:11 +000020CONFIG_H='include/mbedtls/config.h'
Manuel Pégourié-Gonnarde73b2632014-07-12 04:00:00 +020021CONFIG_BAK="$CONFIG_H.bak"
22
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +010023MEMORY=0
Manuel Pégourié-Gonnard259b08a2016-01-08 16:27:41 +010024SHORT=0
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +010025
26while [ $# -gt 0 ]; do
27 case "$1" in
Manuel Pégourié-Gonnard9bda9b32014-11-20 13:10:22 +010028 -m*)
Manuel Pégourié-Gonnard392d3dd2015-01-26 14:03:56 +000029 MEMORY=${1#-m}
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +010030 ;;
Manuel Pégourié-Gonnard259b08a2016-01-08 16:27:41 +010031 -s)
32 SHORT=1
33 ;;
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +010034 *)
35 echo "Unknown argument: '$1'" >&2
36 echo "Use the source, Luke!" >&2
37 exit 1
38 ;;
39 esac
40 shift
41done
42
43# remove built files as well as the cmake cache/config
44cleanup()
45{
46 make clean
Manuel Pégourié-Gonnarde73b2632014-07-12 04:00:00 +020047
Manuel Pégourié-Gonnard77d56bb2015-07-28 15:00:37 +020048 find . -name yotta -prune -o -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} \+
Manuel Pégourié-Gonnard7f809972015-03-09 17:05:11 +000049 rm -f include/Makefile include/mbedtls/Makefile programs/*/Makefile
Paul Bakkerfe0984d2014-06-13 00:13:45 +020050 git update-index --no-skip-worktree Makefile library/Makefile programs/Makefile tests/Makefile
51 git checkout -- Makefile library/Makefile programs/Makefile tests/Makefile
Manuel Pégourié-Gonnarde73b2632014-07-12 04:00:00 +020052
53 if [ -f "$CONFIG_BAK" ]; then
54 mv "$CONFIG_BAK" "$CONFIG_H"
55 fi
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +010056}
57
Manuel Pégourié-Gonnarde73b2632014-07-12 04:00:00 +020058trap cleanup INT TERM HUP
59
Manuel Pégourié-Gonnard3895f5a2014-03-27 14:44:04 +010060msg()
61{
62 echo ""
63 echo "******************************************************************"
Manuel Pégourié-Gonnard9bda9b32014-11-20 13:10:22 +010064 echo "* $1 "
Manuel Pégourié-Gonnard392d3dd2015-01-26 14:03:56 +000065 printf "* "; date
Manuel Pégourié-Gonnard3895f5a2014-03-27 14:44:04 +010066 echo "******************************************************************"
67}
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +010068
Manuel Pégourié-Gonnard57255b12014-06-09 11:21:49 +020069# The test ordering tries to optimize for the following criteria:
Manuel Pégourié-Gonnard89d69b32014-11-20 13:48:53 +010070# 1. Catch possible problems early, by running first tests that run quickly
Manuel Pégourié-Gonnard61bc57a2014-08-14 11:29:06 +020071# and/or are more likely to fail than others (eg I use Clang most of the
72# time, so start with a GCC build).
Manuel Pégourié-Gonnard57255b12014-06-09 11:21:49 +020073# 2. Minimize total running time, by avoiding useless rebuilds
74#
75# Indicative running times are given for reference.
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +010076
Manuel Pégourié-Gonnardea29d152014-11-20 17:32:33 +010077msg "test: recursion.pl" # < 1s
Manuel Pégourié-Gonnardd09a6b52015-04-09 17:19:23 +020078tests/scripts/recursion.pl library/*.c
Manuel Pégourié-Gonnardea29d152014-11-20 17:32:33 +010079
Manuel Pégourié-Gonnardb3b8e432015-02-13 14:52:19 +000080msg "test: freshness of generated source files" # < 1s
81tests/scripts/check-generated-files.sh
82
Manuel Pégourié-Gonnardd09a6b52015-04-09 17:19:23 +020083msg "test: doxygen markup outside doxygen blocks" # < 1s
84tests/scripts/check-doxy-blocks.pl
85
Manuel Pégourié-Gonnarda687baf2015-04-09 11:09:03 +020086msg "test/build: declared and exported names" # < 3s
87cleanup
88tests/scripts/check-names.sh
89
Manuel Pégourié-Gonnard1d552e72016-01-04 16:49:09 +010090if which doxygen >/dev/null; then
91 msg "test: doxygen warnings" # ~ 3s
92 cleanup
93 tests/scripts/doxygen.sh
94fi
95
Manuel Pégourié-Gonnard77d56bb2015-07-28 15:00:37 +020096msg "build: create and build yotta module" # ~ 30s
97cleanup
98tests/scripts/yotta-build.sh
99
Manuel Pégourié-Gonnard89d69b32014-11-20 13:48:53 +0100100msg "build: cmake, gcc, ASan" # ~ 1 min 50s
Manuel Pégourié-Gonnard3895f5a2014-03-27 14:44:04 +0100101cleanup
Manuel Pégourié-Gonnard9bda9b32014-11-20 13:10:22 +0100102CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan .
Manuel Pégourié-Gonnard3895f5a2014-03-27 14:44:04 +0100103make
104
Manuel Pégourié-Gonnard89d69b32014-11-20 13:48:53 +0100105msg "test: main suites and selftest (ASan build)" # ~ 50s
Manuel Pégourié-Gonnard9bda9b32014-11-20 13:10:22 +0100106make test
107programs/test/selftest
Manuel Pégourié-Gonnard57255b12014-06-09 11:21:49 +0200108
Manuel Pégourié-Gonnard89d69b32014-11-20 13:48:53 +0100109msg "test: ssl-opt.sh (ASan build)" # ~ 1 min
Manuel Pégourié-Gonnard3d404b42015-07-08 21:59:16 +0100110tests/ssl-opt.sh
Manuel Pégourié-Gonnard57255b12014-06-09 11:21:49 +0200111
Manuel Pégourié-Gonnard89d69b32014-11-20 13:48:53 +0100112msg "test/build: ref-configs (ASan build)" # ~ 6 min 20s
Manuel Pégourié-Gonnard57255b12014-06-09 11:21:49 +0200113tests/scripts/test-ref-configs.pl
114
Manuel Pégourié-Gonnard89d69b32014-11-20 13:48:53 +0100115# Most frequent issues are likely to be caught at this point
Manuel Pégourié-Gonnard259b08a2016-01-08 16:27:41 +0100116if [ $SHORT -eq 1 ]; then
117 msg "Done, cleaning up"
118 cleanup
119 exit 0
120fi
Manuel Pégourié-Gonnard57255b12014-06-09 11:21:49 +0200121
122msg "build: with ASan (rebuild after ref-configs)" # ~ 1 min
123make
124
Manuel Pégourié-Gonnard89d69b32014-11-20 13:48:53 +0100125msg "test: compat.sh (ASan build)" # ~ 6 min
Manuel Pégourié-Gonnard3d404b42015-07-08 21:59:16 +0100126tests/compat.sh
Manuel Pégourié-Gonnard57255b12014-06-09 11:21:49 +0200127
Manuel Pégourié-Gonnard89d69b32014-11-20 13:48:53 +0100128msg "build: cmake, full config, clang" # ~ 50s
Manuel Pégourié-Gonnard3895f5a2014-03-27 14:44:04 +0100129cleanup
Manuel Pégourié-Gonnarde73b2632014-07-12 04:00:00 +0200130cp "$CONFIG_H" "$CONFIG_BAK"
131scripts/config.pl full
Manuel Pégourié-Gonnard2cf5a7c2015-04-08 12:49:31 +0200132scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests
Manuel Pégourié-Gonnard9bda9b32014-11-20 13:10:22 +0100133CC=clang cmake -D CMAKE_BUILD_TYPE:String=Check .
Manuel Pégourié-Gonnard3895f5a2014-03-27 14:44:04 +0100134make
135
Manuel Pégourié-Gonnard89d69b32014-11-20 13:48:53 +0100136msg "test: main suites (full config)" # ~ 5s
Manuel Pégourié-Gonnarde73b2632014-07-12 04:00:00 +0200137make test
138
Manuel Pégourié-Gonnard89d69b32014-11-20 13:48:53 +0100139msg "test: ssl-opt.sh default (full config)" # ~ 1s
Manuel Pégourié-Gonnard3d404b42015-07-08 21:59:16 +0100140tests/ssl-opt.sh -f Default
Manuel Pégourié-Gonnarde73b2632014-07-12 04:00:00 +0200141
Manuel Pégourié-Gonnardea0920f2015-03-24 09:50:15 +0100142msg "test: compat.sh RC4, DES & NULL (full config)" # ~ 2 min
Manuel Pégourié-Gonnard3d404b42015-07-08 21:59:16 +0100143tests/compat.sh -e '3DES\|DES-CBC3' -f 'NULL\|DES\|RC4\|ARCFOUR'
Manuel Pégourié-Gonnarde73b2632014-07-12 04:00:00 +0200144
Manuel Pégourié-Gonnard503a5ef2015-10-23 09:04:45 +0200145msg "test/build: curves.pl (gcc)" # ~ 4 min
Manuel Pégourié-Gonnard246978d2014-11-20 13:29:53 +0100146cleanup
147cmake -D CMAKE_BUILD_TYPE:String=Debug .
148tests/scripts/curves.pl
149
Manuel Pégourié-Gonnard503a5ef2015-10-23 09:04:45 +0200150msg "test/build: key-exchanges (gcc)" # ~ 1 min
151cleanup
152cmake -D CMAKE_BUILD_TYPE:String=Check .
153tests/scripts/key-exchanges.pl
154
Manuel Pégourié-Gonnard61fe8b02015-03-13 14:33:16 +0000155msg "build: Unix make, -Os (gcc)" # ~ 30s
Manuel Pégourié-Gonnard3895f5a2014-03-27 14:44:04 +0100156cleanup
Manuel Pégourié-Gonnard61fe8b02015-03-13 14:33:16 +0000157CC=gcc CFLAGS='-Werror -Os' make
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +0100158
Manuel Pégourié-Gonnard2cf5a7c2015-04-08 12:49:31 +0200159# this is meant to cath missing #define mbedtls_printf etc
Manuel Pégourié-Gonnard981732b2015-02-17 15:46:45 +0000160# disable fsio to catch some more missing #include <stdio.h>
Manuel Pégourié-Gonnard757ca002015-03-23 15:24:07 +0100161msg "build: full config except platform/fsio, make, gcc" # ~ 30s
Manuel Pégourié-Gonnarda71780e2015-02-13 13:56:55 +0000162cleanup
163cp "$CONFIG_H" "$CONFIG_BAK"
164scripts/config.pl full
Manuel Pégourié-Gonnard2cf5a7c2015-04-08 12:49:31 +0200165scripts/config.pl unset MBEDTLS_PLATFORM_C
166scripts/config.pl unset MBEDTLS_PLATFORM_MEMORY
Manuel Pégourié-Gonnard3d4755b2015-06-03 14:03:17 +0100167scripts/config.pl unset MBEDTLS_PLATFORM_PRINTF_ALT
168scripts/config.pl unset MBEDTLS_PLATFORM_FPRINTF_ALT
169scripts/config.pl unset MBEDTLS_PLATFORM_SNPRINTF_ALT
170scripts/config.pl unset MBEDTLS_PLATFORM_EXIT_ALT
Manuel Pégourié-Gonnard2cf5a7c2015-04-08 12:49:31 +0200171scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C
172scripts/config.pl unset MBEDTLS_FS_IO
Manuel Pégourié-Gonnard61fe8b02015-03-13 14:33:16 +0000173CC=gcc CFLAGS='-Werror -O0' make
Manuel Pégourié-Gonnarda71780e2015-02-13 13:56:55 +0000174
Manuel Pégourié-Gonnarddccb80b2015-06-03 10:20:33 +0100175# catch compile bugs in _uninit functions
176msg "build: full config with NO_STD_FUNCTION, make, gcc" # ~ 30s
177cleanup
178cp "$CONFIG_H" "$CONFIG_BAK"
179scripts/config.pl full
Manuel Pégourié-Gonnard7ee5ddd2015-06-03 10:33:55 +0100180scripts/config.pl set MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
Manuel Pégourié-Gonnarddccb80b2015-06-03 10:20:33 +0100181CC=gcc CFLAGS='-Werror -O0' make
182
Manuel Pégourié-Gonnard66b8e952015-05-20 11:13:56 +0200183msg "build: full config except ssl_srv.c, make, gcc" # ~ 30s
184cleanup
185cp "$CONFIG_H" "$CONFIG_BAK"
186scripts/config.pl full
187scripts/config.pl unset MBEDTLS_SSL_SRV_C
188CC=gcc CFLAGS='-Werror -O0' make
189
190msg "build: full config except ssl_cli.c, make, gcc" # ~ 30s
191cleanup
192cp "$CONFIG_H" "$CONFIG_BAK"
193scripts/config.pl full
194scripts/config.pl unset MBEDTLS_SSL_CLI_C
195CC=gcc CFLAGS='-Werror -O0' make
196
Manuel Pégourié-Gonnardf78e4de2015-05-29 10:52:14 +0200197msg "build: full config except net.c, make, gcc -std=c99 -pedantic" # ~ 30s
Manuel Pégourié-Gonnard009a2642015-05-29 10:31:13 +0200198cleanup
199cp "$CONFIG_H" "$CONFIG_BAK"
200scripts/config.pl full
Manuel Pégourié-Gonnardf78e4de2015-05-29 10:52:14 +0200201scripts/config.pl unset MBEDTLS_NET_C # getaddrinfo() undeclared, etc.
202scripts/config.pl set MBEDTLS_NO_PLATFORM_ENTROPY # uses syscall() on GNU/Linux
Manuel Pégourié-Gonnard71859362015-06-02 16:39:22 +0100203CC=gcc CFLAGS='-Werror -O0 -std=c99 -pedantic' make lib
Manuel Pégourié-Gonnard009a2642015-05-29 10:31:13 +0200204
Manuel Pégourié-Gonnard9b06abe2015-06-25 09:56:07 +0200205if uname -a | grep -F Linux >/dev/null; then
206msg "build/test: make shared" # ~ 40s
207cleanup
208make SHARED=1 all check
209fi
210
Manuel Pégourié-Gonnardedb2dc92015-02-10 14:36:31 +0000211if uname -a | grep -F x86_64 >/dev/null; then
212msg "build: i386, make, gcc" # ~ 30s
213cleanup
214CC=gcc CFLAGS='-Werror -m32' make
215fi # x86_64
216
217if which arm-none-eabi-gcc >/dev/null; then
218msg "build: arm-none-eabi-gcc, make" # ~ 10s
219cleanup
220cp "$CONFIG_H" "$CONFIG_BAK"
221scripts/config.pl full
Manuel Pégourié-Gonnard2cf5a7c2015-04-08 12:49:31 +0200222scripts/config.pl unset MBEDTLS_NET_C
223scripts/config.pl unset MBEDTLS_TIMING_C
224scripts/config.pl unset MBEDTLS_FS_IO
Manuel Pégourié-Gonnardedb2dc92015-02-10 14:36:31 +0000225# following things are not in the default config
Manuel Pégourié-Gonnard2cf5a7c2015-04-08 12:49:31 +0200226scripts/config.pl unset MBEDTLS_HAVEGE_C # depends on timing.c
227scripts/config.pl unset MBEDTLS_THREADING_PTHREAD
228scripts/config.pl unset MBEDTLS_THREADING_C
229scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # execinfo.h
230scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C # calls exit
Manuel Pégourié-Gonnarde058ea22015-06-25 09:04:13 +0200231CC=arm-none-eabi-gcc AR=arm-none-eabi-ar LD=arm-none-eabi-ld CFLAGS=-Werror make lib
Manuel Pégourié-Gonnardedb2dc92015-02-10 14:36:31 +0000232fi # arm-gcc
233
Manuel Pégourié-Gonnard6dc26512015-06-25 10:48:24 +0200234if which armcc >/dev/null && armcc --help >/dev/null 2>&1; then
Manuel Pégourié-Gonnardc5c59392015-02-10 17:38:54 +0100235msg "build: armcc, make"
236cleanup
237cp "$CONFIG_H" "$CONFIG_BAK"
238scripts/config.pl full
Manuel Pégourié-Gonnard2cf5a7c2015-04-08 12:49:31 +0200239scripts/config.pl unset MBEDTLS_NET_C
240scripts/config.pl unset MBEDTLS_TIMING_C
241scripts/config.pl unset MBEDTLS_FS_IO
242scripts/config.pl unset MBEDTLS_HAVE_TIME
Manuel Pégourié-Gonnardbbc60db2015-06-22 14:31:50 +0200243scripts/config.pl unset MBEDTLS_HAVE_TIME_DATE
Manuel Pégourié-Gonnardc5c59392015-02-10 17:38:54 +0100244# following things are not in the default config
Manuel Pégourié-Gonnard2cf5a7c2015-04-08 12:49:31 +0200245scripts/config.pl unset MBEDTLS_DEPRECATED_WARNING
246scripts/config.pl unset MBEDTLS_HAVEGE_C # depends on timing.c
247scripts/config.pl unset MBEDTLS_THREADING_PTHREAD
248scripts/config.pl unset MBEDTLS_THREADING_C
249scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # execinfo.h
250scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C # calls exit
Manuel Pégourié-Gonnard35519012016-01-07 13:06:51 +0100251CC=armcc AR=armar WARNING_CFLAGS= make lib 2> armcc.stderr
Manuel Pégourié-Gonnard129e4132015-03-13 17:29:18 +0100252if [ -s armcc.stderr ]; then
253 cat armcc.stderr
254 exit 1;
255fi
Manuel Pégourié-Gonnardc5c59392015-02-10 17:38:54 +0100256rm armcc.stderr
257fi # armcc
258
Manuel Pégourié-Gonnard6448bce2015-02-16 17:18:36 +0100259if which i686-w64-mingw32-gcc >/dev/null; then
260msg "build: cross-mingw64, make" # ~ 30s
261cleanup
Manuel Pégourié-Gonnarde058ea22015-06-25 09:04:13 +0200262CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS=-Werror WINDOWS_BUILD=1 make
Manuel Pégourié-Gonnard52fa38a2015-06-23 14:29:58 +0200263WINDOWS_BUILD=1 make clean
Manuel Pégourié-Gonnarde33316c2015-08-07 13:17:23 +0200264CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS=-Werror WINDOWS_BUILD=1 SHARED=1 make
265WINDOWS_BUILD=1 make clean
Manuel Pégourié-Gonnard6448bce2015-02-16 17:18:36 +0100266fi
267
Manuel Pégourié-Gonnardedb2dc92015-02-10 14:36:31 +0000268# MemSan currently only available on Linux 64 bits
269if uname -a | grep 'Linux.*x86_64' >/dev/null; then
Manuel Pégourié-Gonnard392d3dd2015-01-26 14:03:56 +0000270
Manuel Pégourié-Gonnard89d69b32014-11-20 13:48:53 +0100271msg "build: MSan (clang)" # ~ 1 min 20s
Manuel Pégourié-Gonnard9bda9b32014-11-20 13:10:22 +0100272cleanup
273cp "$CONFIG_H" "$CONFIG_BAK"
Manuel Pégourié-Gonnard2cf5a7c2015-04-08 12:49:31 +0200274scripts/config.pl unset MBEDTLS_AESNI_C # memsan doesn't grok asm
Manuel Pégourié-Gonnard9bda9b32014-11-20 13:10:22 +0100275CC=clang cmake -D CMAKE_BUILD_TYPE:String=MemSan .
276make
Manuel Pégourié-Gonnard4a9dc2a2014-05-09 13:46:59 +0200277
Manuel Pégourié-Gonnard89d69b32014-11-20 13:48:53 +0100278msg "test: main suites (MSan)" # ~ 10s
Manuel Pégourié-Gonnard9bda9b32014-11-20 13:10:22 +0100279make test
280
281msg "test: ssl-opt.sh (MSan)" # ~ 1 min
Manuel Pégourié-Gonnard3d404b42015-07-08 21:59:16 +0100282tests/ssl-opt.sh
Manuel Pégourié-Gonnard9bda9b32014-11-20 13:10:22 +0100283
284# Optional part(s)
285
286if [ "$MEMORY" -gt 0 ]; then
287 msg "test: compat.sh (MSan)" # ~ 6 min 20s
Manuel Pégourié-Gonnard3d404b42015-07-08 21:59:16 +0100288 tests/compat.sh
Manuel Pégourié-Gonnard57255b12014-06-09 11:21:49 +0200289fi
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +0100290
Manuel Pégourié-Gonnard392d3dd2015-01-26 14:03:56 +0000291else # no MemSan
292
293msg "build: Release (clang)"
294cleanup
295CC=clang cmake -D CMAKE_BUILD_TYPE:String=Release .
296make
297
298msg "test: main suites valgrind (Release)"
Manuel Pégourié-Gonnard9afdc832015-08-04 17:15:13 +0200299make memcheck
Manuel Pégourié-Gonnard392d3dd2015-01-26 14:03:56 +0000300
301# Optional part(s)
302# Currently broken, programs don't seem to receive signals
303# under valgrind on OS X
304
305if [ "$MEMORY" -gt 0 ]; then
306 msg "test: ssl-opt.sh --memcheck (Release)"
Manuel Pégourié-Gonnard3d404b42015-07-08 21:59:16 +0100307 tests/ssl-opt.sh --memcheck
Manuel Pégourié-Gonnard392d3dd2015-01-26 14:03:56 +0000308fi
309
310if [ "$MEMORY" -gt 1 ]; then
311 msg "test: compat.sh --memcheck (Release)"
Manuel Pégourié-Gonnard3d404b42015-07-08 21:59:16 +0100312 tests/compat.sh --memcheck
Manuel Pégourié-Gonnard392d3dd2015-01-26 14:03:56 +0000313fi
314
315fi # MemSan
316
Manuel Pégourié-Gonnard9bda9b32014-11-20 13:10:22 +0100317msg "Done, cleaning up"
Manuel Pégourié-Gonnard80955ee2014-03-19 18:29:01 +0100318cleanup
319