Changeset c2b10fa for src/tests

Timestamp:

Jun 7, 2018, 3:03:10 PM (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, with_gc

Children:

61accc5

Parents:

61d9b4b (diff), a43c561 (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/literals.txt (added)
• .expect/literals.x64.txt (deleted)
• .expect/literals.x86.txt (deleted)
• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• ifwhileCtl.c (modified) (2 diffs)
• preempt_longrun/processor.c (modified) (3 diffs)

src/tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Mon Nov 27 21:34:33 2017
-## Update Count     : 48
+## Last Modified On : Wed Jun  6 16:42:20 2018
+## Update Count     : 49
 ###############################################################################
 
@@ -92 +92 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
-literals : literals.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
-
 sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}

src/tests/Makefile.in

@@ -769 +769 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
 
-literals : literals.c @CFA_BINDIR@/@CFA_NAME@
-        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
-
 sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}

src/tests/ifwhileCtl.c

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// ifcond.c --
+// ifwhileCtl.c --
 //
 // Author           : Peter A. Buhr
 // Created On       : Sat Aug 26 10:13:11 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  4 22:46:48 2018
-// Update Count     : 19
+// Last Modified On : Wed Jun  6 17:15:09 2018
+// Update Count     : 21
 //
 
@@ -72 +72 @@
 // Local Variables: //
 // tab-width: 4 //
-// compile-command: "cfa ifcond.c" //
+// compile-command: "cfa ifwhileCtl.c" //
 // End: //

src/tests/preempt_longrun/processor.c

@@ -2 +2 @@
 #include <thread>
 #include <time>
+
+#include <unistd.h>
 
 #ifndef PREEMPTION_RATE
@@ -15 +17 @@
 int main(int argc, char* argv[]) {
         processor * p[15];
+        write(STDERR_FILENO, "Preparing\n", sizeof("Preparing\n"));
         for ( int pi = 0; pi < 15; pi++ ) {
                 p[pi] = new();
         }
+        write(STDERR_FILENO, "Starting\n", sizeof("Starting\n"));
         for ( int i = 0; i < N; i++) {
                 int pi = i % 15;
@@ -23 +27 @@
                 p[pi] = new();
         }
+        write(STDERR_FILENO, "Stopping\n", sizeof("Stopping\n"));
         for ( int pi = 0; pi < 15; pi++ ) {
                 delete( p[pi] );
         }
+        write(STDERR_FILENO, "Done\n", sizeof("Done\n"));
 }