Mercurial > lcfOS

changeset 286:d9df72971cbf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changed package to module
author Windel Bouwman
date Fri, 15 Nov 2013 13:52:32 +0100
parents e64c8c03128f
children 1c7c1e619be8
files test/c3examples/cast.c3 test/c3examples/comments.c3 test/c3examples/functions.c3 test/c3examples/stm32f4xx.c3 test/c3examples/types.c3 test/runtests.sh test/testzcc.py
diffstat 7 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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()
 {
--- 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()
 {
--- 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()
 {
--- 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;
--- 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;
--- 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
 
--- 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 """