Move tests back to 'examples', skip non-testable examples when testing.

This fixes #259.
sudar · Sep 20, 2014 · 086c6e9 · 086c6e9
1 parent 6f46722
commit 086c6e9
Show file tree

Hide file tree

Showing 23 changed files with 21 additions and 1 deletion.
diff --git a/...s/AnalogInOutSerial/AnalogInOutSerial.ino → ...s/AnalogInOutSerial/AnalogInOutSerial.ino b/...s/AnalogInOutSerial/AnalogInOutSerial.ino → ...s/AnalogInOutSerial/AnalogInOutSerial.ino
diff --git a/tests/AnalogInOutSerial/Makefile → examples/AnalogInOutSerial/Makefile b/tests/AnalogInOutSerial/Makefile → examples/AnalogInOutSerial/Makefile
diff --git a/tests/Blink/Blink.ino → examples/Blink/Blink.ino b/tests/Blink/Blink.ino → examples/Blink/Blink.ino
diff --git a/tests/Blink/Makefile → examples/Blink/Makefile b/tests/Blink/Makefile → examples/Blink/Makefile
diff --git a/tests/BlinkChipKIT/BlinkChipKIT.pde → examples/BlinkChipKIT/BlinkChipKIT.pde b/tests/BlinkChipKIT/BlinkChipKIT.pde → examples/BlinkChipKIT/BlinkChipKIT.pde
diff --git a/tests/BlinkChipKIT/Makefile → examples/BlinkChipKIT/Makefile b/tests/BlinkChipKIT/Makefile → examples/BlinkChipKIT/Makefile
diff --git a/tests/BlinkInAVRC/Makefile → examples/BlinkInAVRC/Makefile b/tests/BlinkInAVRC/Makefile → examples/BlinkInAVRC/Makefile
diff --git a/tests/BlinkInAVRC/blink.c → examples/BlinkInAVRC/blink.c b/tests/BlinkInAVRC/blink.c → examples/BlinkInAVRC/blink.c
diff --git a/...s/BlinkWithoutDelay/BlinkWithoutDelay.ino → ...s/BlinkWithoutDelay/BlinkWithoutDelay.ino b/...s/BlinkWithoutDelay/BlinkWithoutDelay.ino → ...s/BlinkWithoutDelay/BlinkWithoutDelay.ino
diff --git a/tests/BlinkWithoutDelay/Makefile → examples/BlinkWithoutDelay/Makefile b/tests/BlinkWithoutDelay/Makefile → examples/BlinkWithoutDelay/Makefile
diff --git a/tests/Fade/Fade.ino → examples/Fade/Fade.ino b/tests/Fade/Fade.ino → examples/Fade/Fade.ino
diff --git a/tests/Fade/Makefile → examples/Fade/Makefile b/tests/Fade/Makefile → examples/Fade/Makefile
diff --git a/tests/HelloWorld/HelloWorld.ino → examples/HelloWorld/HelloWorld.ino b/tests/HelloWorld/HelloWorld.ino → examples/HelloWorld/HelloWorld.ino
diff --git a/tests/HelloWorld/Makefile → examples/HelloWorld/Makefile b/tests/HelloWorld/Makefile → examples/HelloWorld/Makefile
diff --git a/tests/TestSuiteCommon.mk → examples/TestSuiteCommon.mk b/tests/TestSuiteCommon.mk → examples/TestSuiteCommon.mk
diff --git a/tests/WebServer/Makefile → examples/WebServer/Makefile b/tests/WebServer/Makefile → examples/WebServer/Makefile
diff --git a/tests/WebServer/WebServer.ino → examples/WebServer/WebServer.ino b/tests/WebServer/WebServer.ino → examples/WebServer/WebServer.ino
diff --git a/tests/master_reader/Makefile → examples/master_reader/Makefile b/tests/master_reader/Makefile → examples/master_reader/Makefile
diff --git a/tests/master_reader/master_reader.ino → examples/master_reader/master_reader.ino b/tests/master_reader/master_reader.ino → examples/master_reader/master_reader.ino
diff --git a/tests/toneMelody/Makefile → examples/toneMelody/Makefile b/tests/toneMelody/Makefile → examples/toneMelody/Makefile
diff --git a/tests/toneMelody/pitches.h → examples/toneMelody/pitches.h b/tests/toneMelody/pitches.h → examples/toneMelody/pitches.h
diff --git a/tests/toneMelody/toneMelody.ino → examples/toneMelody/toneMelody.ino b/tests/toneMelody/toneMelody.ino → examples/toneMelody/toneMelody.ino
diff --git 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`