Changeset d67cdb7 for src/tests

Timestamp:

Sep 26, 2017, 11:27:38 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

5dc26f5

Parents:

201aeb9

Message:

merge

Location:

src/tests

Files:

• .expect/32/sched-ext-parse.txt (added)
• .expect/64/sched-ext-parse.txt (added)
• .expect/concurrent/sched-ext-barge.txt (added)
• .expect/concurrent/sched-ext-statment.txt (added)
• .expect/sched-ext-else.txt (added)
• Makefile.am (modified) (2 diffs)
• Makefile.in (modified) (2 diffs)
• sched-ext-barge.c (added)
• sched-ext-else.c (added)
• sched-ext-parse.c (modified) (1 diff)
• sched-ext-statment.c (added)
• sched-ext.c (modified) (1 diff)

src/tests/Makefile.am

@@ -22 +22 @@
 concurrent = yes
 quick_test += coroutine thread monitor
-concurrent_test = coroutine thread monitor multi-monitor sched-int-barge sched-int-block sched-int-disjoint sched-int-wait sched-ext sched-ext-multi preempt
+concurrent_test = coroutine thread monitor multi-monitor sched-int-block sched-int-disjoint sched-int-wait sched-ext-barge sched-ext-else sched-ext-parse sched-ext-statment preempt
 else
 concurrent=no
@@ -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

@@ -320 +320 @@
 @BUILD_CONCURRENCY_TRUE@concurrent = yes
 @BUILD_CONCURRENCY_FALSE@concurrent_test = 
-@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int-barge sched-int-block sched-int-disjoint sched-int-wait sched-ext sched-ext-multi preempt
+@BUILD_CONCURRENCY_TRUE@concurrent_test = coroutine thread monitor multi-monitor sched-int-block sched-int-disjoint sched-int-wait sched-ext-barge sched-ext-else sched-ext-parse sched-ext-statment preempt
 
 # applies to both programs
@@ -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;