# HG changeset patch # User Windel Bouwman # Date 1384519952 -3600 # Node ID d9df72971cbf0acdd9de22a217645cee1363b43d # Parent e64c8c03128f3ebabafacad284064ba58faae4a5 Changed package to module diff -r e64c8c03128f -r d9df72971cbf test/c3examples/cast.c3 --- a/test/c3examples/cast.c3 Fri Nov 15 13:45:34 2013 +0100 +++ b/test/c3examples/cast.c3 Fri Nov 15 13:52:32 2013 +0100 @@ -3,7 +3,7 @@ Demo of how to type cast */ -package castdemo; +module castdemo; function int testcast() { diff -r e64c8c03128f -r d9df72971cbf test/c3examples/comments.c3 --- a/test/c3examples/comments.c3 Fri Nov 15 13:45:34 2013 +0100 +++ b/test/c3examples/comments.c3 Fri Nov 15 13:52:32 2013 +0100 @@ -5,7 +5,7 @@ */ // fjd jjd- -package comments; // hjfkds +module comments; // hjfkds function int tst() { diff -r e64c8c03128f -r d9df72971cbf test/c3examples/functions.c3 --- a/test/c3examples/functions.c3 Fri Nov 15 13:45:34 2013 +0100 +++ b/test/c3examples/functions.c3 Fri Nov 15 13:52:32 2013 +0100 @@ -3,7 +3,7 @@ Demo of function usage */ -package functiondemo; +module functiondemo; function void main() { diff -r e64c8c03128f -r d9df72971cbf test/c3examples/stm32f4xx.c3 --- a/test/c3examples/stm32f4xx.c3 Fri Nov 15 13:45:34 2013 +0100 +++ b/test/c3examples/stm32f4xx.c3 Fri Nov 15 13:52:32 2013 +0100 @@ -1,5 +1,5 @@ -package stm32f4xx; +module stm32f4xx; type struct { int MODER; diff -r e64c8c03128f -r d9df72971cbf test/c3examples/types.c3 --- a/test/c3examples/types.c3 Fri Nov 15 13:45:34 2013 +0100 +++ b/test/c3examples/types.c3 Fri Nov 15 13:52:32 2013 +0100 @@ -3,7 +3,7 @@ Demo of how to define types */ -package typedemo; +module typedemo; type int A; type int B; diff -r e64c8c03128f -r d9df72971cbf test/runtests.sh --- a/test/runtests.sh Fri Nov 15 13:45:34 2013 +0100 +++ b/test/runtests.sh Fri Nov 15 13:52:32 2013 +0100 @@ -10,6 +10,7 @@ inotifywait -r -e modify $DIR done else + set -e python -m unittest -v fi diff -r e64c8c03128f -r d9df72971cbf test/testzcc.py --- a/test/testzcc.py Fri Nov 15 13:45:34 2013 +0100 +++ b/test/testzcc.py Fri Nov 15 13:52:32 2013 +0100 @@ -4,13 +4,14 @@ import outstream import ppci + class ZccTestCase(unittest.TestCase): """ Tests the compiler driver """ def do(self, fn): """ Compile blink.c3 """ - args = zcc.parser.parse_args([fn, '--package_dir', './c3examples']) - zcc.main(args) + args = zcc.parser.parse_args([fn, '--package_dir', './c3examples/']) + self.assertEqual(0, zcc.main(args)) def testExamples(self): """ Test all examples in the c3/examples directory """