Changeset c58f4ab for src/tests

Timestamp:

Mar 23, 2017, 11:30:42 AM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

578b637

Parents:

9fcdfa3 (diff), 27cc24e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/tests

Files:

• .expect/io.txt (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• io.c (modified) (5 diffs)
• test.py (modified) (1 diff)

src/tests/.expect/io.txt

@@ -18 +18 @@
 abc, $xyz
 
-v(27 v[27 v{27 $27 £27 ¥27 ¡27 ¿27 «27
-25, 25. 25: 25; 25! 25? 25) 25] 25} 25% 25¢ 25»
+v(27 v[27 v{27 $27 =27 £27 ¥27 ¡27 ¿27 «27
+25, 25. 25: 25; 25! 25? 25% 25¢ 25» 25) 25] 25}
 25'27 25`27 25"27 25 27 25
 27 25
@@ -25 +25 @@
 27 25   27 25
 27
+3, 4, a, 7.2
+3, 4, a, 7.2
+3 4 a 7.2
+ 3 4 a 7.234a7.2 3 4 a 7.2
+3-4-a-7.2^3^4-3-4-a-7.2

src/tests/Makefile.am

@@ -51 +51 @@
         @+python test.py --list --concurrent=${concurrent}
 
+.dummy : .dummy.c
+        ${CC} ${CFLAGS} -XCFA -n ${<} -o ${@}
+
 constant0-1DP : constant0-1.c
         ${CC} ${CFLAGS} -DDUPS ${<} -o ${@}

src/tests/Makefile.in

@@ -669 +669 @@
         @+python test.py --list --concurrent=${concurrent}
 
+.dummy : .dummy.c
+        ${CC} ${CFLAGS} -XCFA -n ${<} -o ${@}
+
 constant0-1DP : constant0-1.c
         ${CC} ${CFLAGS} -DDUPS ${<} -o ${@}

src/tests/io.c

@@ -10 +10 @@
 // Created On       : Wed Mar  2 16:56:02 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  5 18:29:23 2016
-// Update Count     : 31
+// Last Modified On : Tue Mar 21 22:36:06 2017
+// Update Count     : 48
 // 
 
@@ -62 +62 @@
 
         sepSet( sout, ", $" );                                                                          // change separator, maximum of 15 characters
-        sout | f | d | ld | endl                                                                        // floating point without separator
-                 | fc | dc | ldc | endl                                                                 // complex without separator
+        sout | f | d | ld | endl
+                 | fc | dc | ldc | endl
                  | s1 | s2 | endl;
         sout | endl;
@@ -74 +74 @@
                 | "v{" | 27
                 | "$" | 27
+                | "=" | 27
                 | "£" | 27
                 | "¥" | 27
@@ -87 +88 @@
                 | 25 | "!"
                 | 25 | "?"
+                | 25 | "%"
+                | 25 | "¢"
+                | 25 | "»"
                 | 25 | ")"
                 | 25 | "]"
                 | 25 | "}"
-                | 25 | "%"
-                | 25 | "¢"
-                | 25 | "»"
                 | endl
                 // opening-closing delimiters
@@ -105 +106 @@
                 | 25 | "\v" | 27
                 | endl;
+
+        [int, int, const char *, double] t = { 3, 4, "a", 7.2 };
+        sout | [ 3, 4, "a", 7.2 ] | endl;
+        sout | t | endl;
+        sepSetTuple( sout, " " );
+        sout | t | endl;
+        sout | sepOn | t | sepDisable | t | sepEnable | t | endl;
+        sepSet( sout, "^" );
+        sepSetTuple( sout, "-" );
+        sout | t | 3 | 4 | t | endl;
 }
 

src/tests/test.py

@@ -25 +25 @@
 # parses the Makefile to find the machine type (32-bit / 64-bit)
 def getMachineType():
-        sh('echo "int main() { return 0; }" > .dummy.c')
+        sh('echo "void ?{}(int*a,int b){}int main(){return 0;}" > .dummy.c')
         sh("make .dummy", print2stdout=False)
         _, out = sh("file .dummy", print2stdout=False)