Changeset 6250a312 for src/tests

Timestamp:

May 10, 2017, 5:00:47 PM (9 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:

8514fe19, dbfb35d

Parents:

0f9bef3 (diff), 29cf9c8 (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/concurrent/sched-int-barge.txt (added)
• .expect/concurrent/sched-int-disjoint.txt (added)
• .expect/concurrent/sched-int-multi.txt (deleted)
• .expect/concurrent/sched-int-wait.txt (added)
• .expect/concurrent/sched-int.txt (deleted)
• .expect/rational.txt (added)
• .in/rational.txt (added)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• rational.c (modified) (3 diffs)
• sched-int-barge.c (added)
• sched-int-disjoint.c (added)
• sched-int-multi.c (deleted)
• sched-int-wait.c (added)
• sched-int.c (deleted)

src/tests/Makefile.am

@@ -22 +22 @@
 concurrent=yes
 quick_test+= coroutine thread monitor
-concurrent_test=coroutine thread monitor multi-monitor sched-int sched-ext preempt
+concurrent_test=coroutine thread monitor multi-monitor sched-int-disjoint sched-int-barge sched-int-wait sched-ext sched-ext-multi preempt
 else
 concurrent=no

src/tests/Makefile.in

@@ -230 +230 @@
 @BUILD_CONCURRENCY_TRUE@concurrent = yes
 @BUILD_CONCURRENCY_FALSE@concurrent_test = 
-@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int sched-ext preempt
-TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
+@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int-disjoint sched-int-barge sched-int-wait sched-ext sched-ext-multi preempt
 
 # applies to both programs
 EXTRA_FLAGS = 
 BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
 fstream_test_SOURCES = fstream_test.c
 vector_test_SOURCES = vector/vector_int.c vector/array.c vector/vector_test.c

src/tests/rational.c

@@ -10 +10 @@
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul  5 18:29:37 2016
-// Update Count     : 25
+// Last Modified On : Tue May  2 22:11:05 2017
+// Update Count     : 41
 // 
 
@@ -36 +36 @@
         b = (Rational){ -3, 2 };
         sout | a | b | endl;
-        sout | a == 1 | endl;
+//      sout | a == 1 | endl; // FIX ME
         sout | a != b | endl;
         sout | a <  b | endl;
@@ -61 +61 @@
         sout | narrow( 3.14159265358979, 256 ) | endl;
 
+        sout | "decompose" | endl;
+        RationalImpl n, d;
+//      [n, d] = a;
+//      sout | a | n | d | endl;
+
+        sout | "more tests" | endl;
         Rational x = { 1, 2 }, y = { 2 };
         sout | x - y | endl;