Changeset 63be3387 for tests

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (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:

tests

Files:

• .expect/loop-inc.txt (added)
• array-container/.expect/array-sbscr-types.txt (added)
• array-container/array-basic.cfa (modified) (1 diff)
• array-container/array-sbscr-types.cfa (added)
• collections/atomic_mpsc.cfa (modified) (1 diff)
• concurrent/.expect/migrate.txt (added)
• concurrent/.expect/once.txt (added)
• concurrent/migrate.cfa (added)
• concurrent/once.cfa (added)
• concurrent/pthread/.expect/bounded_buffer.txt (added)
• concurrent/pthread/.expect/pthread_attr_test.txt (added)
• concurrent/pthread/.expect/pthread_cond_test.txt (added)
• concurrent/pthread/.expect/pthread_demo_create_join.txt (added)
• concurrent/pthread/.expect/pthread_demo_lock.txt (added)
• concurrent/pthread/.expect/pthread_key_test.txt (added)
• concurrent/pthread/.expect/pthread_once_test.txt (added)
• concurrent/pthread/bounded_buffer.cfa (added)
• concurrent/pthread/pthread_attr_test.cfa (added)
• concurrent/pthread/pthread_cond_test.cfa (added)
• concurrent/pthread/pthread_demo_create_join.cfa (added)
• concurrent/pthread/pthread_demo_lock.cfa (added)
• concurrent/pthread/pthread_key_test.cfa (added)
• concurrent/pthread/pthread_once_test.cfa (added)
• configs/parsebools.cfa (modified) (1 diff)
• configs/parsenums.cfa (modified) (1 diff)
• configs/usage.cfa (modified) (1 diff)
• enum_tests/.expect/enumInlineValue.txt (modified) (1 diff)
• enum_tests/.expect/qualifiedEnum.cfa (modified) (1 diff)
• enum_tests/enumInlineValue.cfa (modified) (1 diff)
• enum_tests/qualifiedEnum.cfa (modified) (1 diff)
• loop-inc.cfa (added)

tests/array-container/array-basic.cfa

@@ -78 +78 @@
 }
 
-forall( A & | ar(A, float) )
+forall( [N], A & | ar(A, float, N) )
 float total1d_hi( A & a ) {
     float total = 0.0f;
-    for (i; a`len)
+    for (i; N)
         total += a[i];
     return total;

tests/collections/atomic_mpsc.cfa

@@ -1 +1 @@
 #include <fstream.hfa>
-#include <queueLockFree.hfa>
+#include <containers/lockfree.hfa>
 #include <thread.hfa>
 

tests/configs/parsebools.cfa

@@ -16 +16 @@
 
 #include <fstream.hfa>
-#include <parseargs.hfa>
 
 #include "../meta/fork+exec.hfa"
+
+// last as a work around to a parse bug
+#include <parseargs.hfa>
 
 int main(int argc, char * argv[]) {

tests/configs/parsenums.cfa

@@ -16 +16 @@
 
 #include <fstream.hfa>
+
+#include "../meta/fork+exec.hfa"
+
+// last as workaround to parser bug
 #include <parseargs.hfa>
-
-#include "../meta/fork+exec.hfa"
 
 #if __SIZEOF_LONG__ == 4

tests/configs/usage.cfa

@@ -16 +16 @@
 
 #include <fstream.hfa>
+#include "../meta/fork+exec.hfa"
 #include <parseargs.hfa>
 
-#include "../meta/fork+exec.hfa"
 
 int main() {

tests/enum_tests/.expect/enumInlineValue.txt

@@ -1 +1 @@
 enumB.A is 5
-enumB.B is 10
+enumB.B is 6
 enumB.D is 11
 enumB.E is 12

tests/enum_tests/.expect/qualifiedEnum.cfa

@@ -1 @@
-l :0
+l :1

tests/enum_tests/enumInlineValue.cfa

@@ -6 +6 @@
 enum enumB {
     inline enumA,
-    E, B=10
+    E
 };
 

tests/enum_tests/qualifiedEnum.cfa

@@ -8 +8 @@
 
 int main() {
-    enum Level l = Level.LOW;
+    enum Level l = Level.MEDIUM;
     sout | "l :" | l;
     return 0;