diff options
| author | Christopher Peplin <chris.peplin@rhubarbtech.com> | 2014-09-20 16:14:32 -0400 |
|---|---|---|
| committer | Christopher Peplin <chris.peplin@rhubarbtech.com> | 2014-09-20 16:14:32 -0400 |
| commit | 086c6e96ca4b98e8a144b5f7f37a7b3b6fedc61d (patch) | |
| tree | a400644b8017ab3842e980eaf5df0f4e7437ca47 | |
| parent | 6f46722abb40c60dcaa0e40292342d015906c8bf (diff) | |
Move tests back to 'examples', skip non-testable examples when testing.
This fixes https://github.com/sudar/Arduino-Makefile/issues/259.
| -rw-r--r-- | examples/AnalogInOutSerial/AnalogInOutSerial.ino (renamed from tests/AnalogInOutSerial/AnalogInOutSerial.ino) | 0 | ||||
| -rw-r--r-- | examples/AnalogInOutSerial/Makefile (renamed from tests/AnalogInOutSerial/Makefile) | 0 | ||||
| -rw-r--r-- | examples/Blink/Blink.ino (renamed from tests/Blink/Blink.ino) | 0 | ||||
| -rw-r--r-- | examples/Blink/Makefile (renamed from tests/Blink/Makefile) | 0 | ||||
| -rw-r--r-- | examples/BlinkChipKIT/BlinkChipKIT.pde (renamed from tests/BlinkChipKIT/BlinkChipKIT.pde) | 0 | ||||
| -rw-r--r-- | examples/BlinkChipKIT/Makefile (renamed from tests/BlinkChipKIT/Makefile) | 0 | ||||
| -rw-r--r-- | examples/BlinkInAVRC/Makefile (renamed from tests/BlinkInAVRC/Makefile) | 0 | ||||
| -rw-r--r-- | examples/BlinkInAVRC/blink.c (renamed from tests/BlinkInAVRC/blink.c) | 0 | ||||
| -rw-r--r-- | examples/BlinkWithoutDelay/BlinkWithoutDelay.ino (renamed from tests/BlinkWithoutDelay/BlinkWithoutDelay.ino) | 0 | ||||
| -rw-r--r-- | examples/BlinkWithoutDelay/Makefile (renamed from tests/BlinkWithoutDelay/Makefile) | 0 | ||||
| -rw-r--r-- | examples/Fade/Fade.ino (renamed from tests/Fade/Fade.ino) | 0 | ||||
| -rw-r--r-- | examples/Fade/Makefile (renamed from tests/Fade/Makefile) | 0 | ||||
| -rw-r--r-- | examples/HelloWorld/HelloWorld.ino (renamed from tests/HelloWorld/HelloWorld.ino) | 0 | ||||
| -rw-r--r-- | examples/HelloWorld/Makefile (renamed from tests/HelloWorld/Makefile) | 0 | ||||
| -rw-r--r-- | examples/TestSuiteCommon.mk (renamed from tests/TestSuiteCommon.mk) | 0 | ||||
| -rw-r--r-- | examples/WebServer/Makefile (renamed from tests/WebServer/Makefile) | 0 | ||||
| -rw-r--r-- | examples/WebServer/WebServer.ino (renamed from tests/WebServer/WebServer.ino) | 0 | ||||
| -rw-r--r-- | examples/master_reader/Makefile (renamed from tests/master_reader/Makefile) | 0 | ||||
| -rw-r--r-- | examples/master_reader/master_reader.ino (renamed from tests/master_reader/master_reader.ino) | 0 | ||||
| -rw-r--r-- | examples/toneMelody/Makefile (renamed from tests/toneMelody/Makefile) | 0 | ||||
| -rw-r--r-- | examples/toneMelody/pitches.h (renamed from tests/toneMelody/pitches.h) | 0 | ||||
| -rw-r--r-- | examples/toneMelody/toneMelody.ino (renamed from tests/toneMelody/toneMelody.ino) | 0 | ||||
| -rwxr-xr-x | script/runtests.sh | 22 |
23 files changed, 21 insertions, 1 deletions
diff --git a/tests/AnalogInOutSerial/AnalogInOutSerial.ino b/examples/AnalogInOutSerial/AnalogInOutSerial.ino index e142f69..e142f69 100644 --- a/tests/AnalogInOutSerial/AnalogInOutSerial.ino +++ b/examples/AnalogInOutSerial/AnalogInOutSerial.ino diff --git a/tests/AnalogInOutSerial/Makefile b/examples/AnalogInOutSerial/Makefile index 872d069..872d069 100644 --- a/tests/AnalogInOutSerial/Makefile +++ b/examples/AnalogInOutSerial/Makefile diff --git a/tests/Blink/Blink.ino b/examples/Blink/Blink.ino index 1953c39..1953c39 100644 --- a/tests/Blink/Blink.ino +++ b/examples/Blink/Blink.ino diff --git a/tests/Blink/Makefile b/examples/Blink/Makefile index d41effa..d41effa 100644 --- a/tests/Blink/Makefile +++ b/examples/Blink/Makefile diff --git a/tests/BlinkChipKIT/BlinkChipKIT.pde b/examples/BlinkChipKIT/BlinkChipKIT.pde index 1953c39..1953c39 100644 --- a/tests/BlinkChipKIT/BlinkChipKIT.pde +++ b/examples/BlinkChipKIT/BlinkChipKIT.pde diff --git a/tests/BlinkChipKIT/Makefile b/examples/BlinkChipKIT/Makefile index bec2794..bec2794 100644 --- a/tests/BlinkChipKIT/Makefile +++ b/examples/BlinkChipKIT/Makefile diff --git a/tests/BlinkInAVRC/Makefile b/examples/BlinkInAVRC/Makefile index 9080b24..9080b24 100644 --- a/tests/BlinkInAVRC/Makefile +++ b/examples/BlinkInAVRC/Makefile diff --git a/tests/BlinkInAVRC/blink.c b/examples/BlinkInAVRC/blink.c index d8b7c8f..d8b7c8f 100644 --- a/tests/BlinkInAVRC/blink.c +++ b/examples/BlinkInAVRC/blink.c diff --git a/tests/BlinkWithoutDelay/BlinkWithoutDelay.ino b/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino index 0143571..0143571 100644 --- a/tests/BlinkWithoutDelay/BlinkWithoutDelay.ino +++ b/examples/BlinkWithoutDelay/BlinkWithoutDelay.ino diff --git a/tests/BlinkWithoutDelay/Makefile b/examples/BlinkWithoutDelay/Makefile index 872d069..872d069 100644 --- a/tests/BlinkWithoutDelay/Makefile +++ b/examples/BlinkWithoutDelay/Makefile diff --git a/tests/Fade/Fade.ino b/examples/Fade/Fade.ino index b47bf43..b47bf43 100644 --- a/tests/Fade/Fade.ino +++ b/examples/Fade/Fade.ino diff --git a/tests/Fade/Makefile b/examples/Fade/Makefile index 872d069..872d069 100644 --- a/tests/Fade/Makefile +++ b/examples/Fade/Makefile diff --git a/tests/HelloWorld/HelloWorld.ino b/examples/HelloWorld/HelloWorld.ino index e99957d..e99957d 100644 --- a/tests/HelloWorld/HelloWorld.ino +++ b/examples/HelloWorld/HelloWorld.ino diff --git a/tests/HelloWorld/Makefile b/examples/HelloWorld/Makefile index 0af2ed4..0af2ed4 100644 --- a/tests/HelloWorld/Makefile +++ b/examples/HelloWorld/Makefile diff --git a/tests/TestSuiteCommon.mk b/examples/TestSuiteCommon.mk index 5fa4f50..5fa4f50 100644 --- a/tests/TestSuiteCommon.mk +++ b/examples/TestSuiteCommon.mk diff --git a/tests/WebServer/Makefile b/examples/WebServer/Makefile index 5fbefae..5fbefae 100644 --- a/tests/WebServer/Makefile +++ b/examples/WebServer/Makefile diff --git a/tests/WebServer/WebServer.ino b/examples/WebServer/WebServer.ino index fb2a1b9..fb2a1b9 100644 --- a/tests/WebServer/WebServer.ino +++ b/examples/WebServer/WebServer.ino diff --git a/tests/master_reader/Makefile b/examples/master_reader/Makefile index 8a42a8e..8a42a8e 100644 --- a/tests/master_reader/Makefile +++ b/examples/master_reader/Makefile diff --git a/tests/master_reader/master_reader.ino b/examples/master_reader/master_reader.ino index 4124d7d..4124d7d 100644 --- a/tests/master_reader/master_reader.ino +++ b/examples/master_reader/master_reader.ino diff --git a/tests/toneMelody/Makefile b/examples/toneMelody/Makefile index 872d069..872d069 100644 --- a/tests/toneMelody/Makefile +++ b/examples/toneMelody/Makefile diff --git a/tests/toneMelody/pitches.h b/examples/toneMelody/pitches.h index 55c7d54..55c7d54 100644 --- a/tests/toneMelody/pitches.h +++ b/examples/toneMelody/pitches.h diff --git a/tests/toneMelody/toneMelody.ino b/examples/toneMelody/toneMelody.ino index 8593ab7..8593ab7 100644 --- a/tests/toneMelody/toneMelody.ino +++ b/examples/toneMelody/toneMelody.ino diff --git a/script/runtests.sh b/script/runtests.sh index ad42f74..5f513da 100755 --- a/script/runtests.sh +++ b/script/runtests.sh @@ -1,11 +1,31 @@ #!/usr/bin/env bash +TESTS_DIR=examples + failures=() -for dir in tests/*/ +# These examples cannot be tested easily at the moment as they require +# alternate cores. The MakefileExample doesn't actually contain any source code +# to compile. +NON_TESTABLE_EXAMPLES=(ATtinyBlink MakefileExample TinySoftWareSerial) + +for dir in $TESTS_DIR/*/ do dir=${dir%*/} example=${dir##*/} + example_is_testable=true + for non_testable_example in "${NON_TESTABLE_EXAMPLES[@]}"; do + if [[ $example == $non_testable_example ]]; then + example_is_testable=false + break + fi + done + + if ! $example_is_testable; then + echo "Skipping non-testable example $example..." + continue + fi + pushd $dir echo "Compiling $example..." make_output=`make clean` |
