Changeset a12d5aa for src/tests

Timestamp:

Jun 29, 2017, 5:13:42 PM (7 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:

435e75f

Parents:

62423350 (diff), 1abc5ab (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' into designations

Location:

src/tests

Files:

• preempt_longrun/Makefile.am (modified) (1 diff)
• preempt_longrun/Makefile.in (modified) (1 diff)
• preempt_longrun/barge.c (added)
• preempt_longrun/block.c (added)
• preempt_longrun/disjoint.c (added)
• preempt_longrun/wait.c (added)
• sched-int-block.c (modified) (1 diff)
• sched-int-disjoint.c (modified) (1 diff)
• sched-int-wait.c (modified) (1 diff)

src/tests/preempt_longrun/Makefile.am

@@ -16 +16 @@
 
 repeats=10
-max_time=10
-N=10ul
+max_time=30
 preempt=10_000ul
 
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
 
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DN=${N} -DPREEMPTION_RATE=${preempt}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
 CFLAGS = ${BUILD_FLAGS}
 CC = @CFA_BINDIR@/@CFA_NAME@
 
-TESTS = create stack yield
+TESTS = barge block create disjoint processor stack wait yield
 
 .INTERMEDIATE: ${TESTS}

src/tests/preempt_longrun/Makefile.in

@@ -178 +178 @@
 top_srcdir = @top_srcdir@
 repeats = 10
-max_time = 10
-N = 10ul
+max_time = 30
 preempt = 10_000ul
 REPEAT = ${abs_top_srcdir}/tools/repeat -s
-BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DN=${N} -DPREEMPTION_RATE=${preempt}
-TESTS = create stack yield
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ -debug -O2 -DPREEMPTION_RATE=${preempt}
+TESTS = barge block create disjoint processor stack wait yield
 all: all-am
 

src/tests/sched-int-block.c

@@ -5 +5 @@
 #include <thread>
 
-static const unsigned N = 100_000;
+#ifndef N
+#define N 100_000
+#endif
 
 enum state_t { WAITED, SIGNAL, BARGE };

src/tests/sched-int-disjoint.c

@@ -4 +4 @@
 #include <thread>
 
+#ifndef N
 #define N 100_000
+#endif
 
 enum state_t { WAIT, SIGNAL, BARGE };

src/tests/sched-int-wait.c

@@ -5 +5 @@
 #include <thread>
 
-static const int N = 10_000;
+#ifndef N
+#define N 10_000
+#endif
 
 monitor global_t {};