Changeset 1cb758f2 for src/tests

Timestamp:

Aug 27, 2017, 11:26:26 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

111a8af8, 26238c1, 7ee1e2f6

Parents:

0c6596f (diff), eca3d10a (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:/u/cforall/software/cfa/cfa-cc

Location:

src/tests

Files:

• .expect/64/gmp.txt (moved) (moved from src/tests/.expect/gmp.txt )
• .expect/ifcond.txt (added)
• gmp.c (modified) (1 diff)
• ifcond.c (added)
• preempt_longrun/stack.c (modified) (1 diff)
• sched-ext.c (added)
• sched-int-disjoint.c (modified) (2 diffs)
• sched-int-wait.c (modified) (2 diffs)
• switch.c (modified) (2 diffs)

src/tests/gmp.c

@@ -10 +10 @@
 // Created On       : Tue Apr 19 08:55:51 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug 24 09:33:26 2017
-// Update Count     : 543
+// Last Modified On : Fri Aug 25 12:50:01 2017
+// Update Count     : 544
 // 
+
+// NOTE: UBUNTU DOES NOT SUPPORT GMP MULTILIB, SO ONLY 64-BIT GMP IS TESTED.
 
 #include <gmp>

src/tests/preempt_longrun/stack.c

@@ -15 +15 @@
 
 void main(worker_t * this) {
-        volatile long p = 5_021_609ul;
-        volatile long a = 326_417ul;
-        volatile long n = 1l;
-        for (volatile long i = 0; i < p; i++) {
+        volatile long long p = 5_021_609ul;
+        volatile long long a = 326_417ul;
+        volatile long long n = 1l;
+        for (volatile long long i = 0; i < p; i++) {
                 n *= a;
                 n %= p;

src/tests/sched-int-disjoint.c

@@ -3 +3 @@
 #include <monitor>
 #include <thread>
+
+#include <time.h>
 
 static const unsigned long N = 10_000ul;
@@ -107 +109 @@
 // Main loop
 int main(int argc, char* argv[]) {
+        rand48seed( time( NULL ) );
         all_done = false;
         processor p;

src/tests/sched-int-wait.c

@@ -5 +5 @@
 #include <thread>
 
-static const unsigned long N = 10_000ul;
+#include <time.h>
+
+static const unsigned long N = 2_500ul;
 
 #ifndef PREEMPTION_RATE
@@ -119 +121 @@
 // Main
 int main(int argc, char* argv[]) {
+        rand48seed( time( NULL ) );
         waiter_left = 4;
         processor p[2];

src/tests/switch.c

@@ -10 +10 @@
 // Created On       : Tue Jul 12 06:50:22 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Aug  4 11:44:29 2016
-// Update Count     : 31
+// Last Modified On : Sat Aug 26 10:14:21 2017
+// Update Count     : 33
 // 
 
 int f( int i ) { return i; }
 
-int main() {
+int main( void ) {
         int i = 0;
         switch ( i ) case 3 : i = 1;
@@ -100 +100 @@
                 j = 5;
         } // choose
-}
+} // main
 
 // Local Variables: //