Changeset f265042 for src/tests

Timestamp:

Sep 25, 2017, 12:07:43 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, resolv-new, stuck-waitfor-destruct, with_gc

Children:

3aeaecd

Parents:

1755226 (diff), 596bc0a (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/sched-ext-else.txt (added)
• .expect/sched-ext-parse.txt (added)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• sched-ext-else.c (added)
• sched-ext-parse.c (modified) (1 diff)
• sched-ext.c (modified) (1 diff)

src/tests/Makefile.am

@@ -104 +104 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
+sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+
 gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp ${<} -o ${@}

src/tests/Makefile.in

@@ -856 +856 @@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
+sched-ext-parse : sched-ext-parse.c @CFA_BINDIR@/@CFA_NAME@
+        ${CC} ${AM_CFLAGS} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+
 gmp : gmp.c @CFA_BINDIR@/@CFA_NAME@
         ${CC} ${AM_CFLAGS} ${CFLAGS} -lgmp ${<} -o ${@}

src/tests/sched-ext-parse.c

@@ -80 +80 @@
                 16;
         }
-        or waitfor( f1, a, a ) {
+        or waitfor( f2, a, a ) {
                 17;
         }

src/tests/sched-ext.c

@@ -45 +45 @@
         acceptable.monitors      = &a;
 
-        __accept_internal( 1, &acceptable );
+        __waitfor_internal( 1, &acceptable );
 
         sout | "Accepted" | endl;