Diff of /tests/GNUmakefile [135d6f] .. [a3ea0b]  Maximize  Restore

  Switch to side-by-side view

--- a/tests/GNUmakefile
+++ b/tests/GNUmakefile
@@ -44,15 +44,15 @@
 MKDIR	= mkdir
 TOUCH	= echo Passed >
 ECHO	= @echo
-MAKE	= make
+MAKE	= make -k
 
 #
 # Mingw32
 #
 XXCFLAGS	= 
-XXLIBS	= -lws2_32
+XXLIBS	= -lws2_32 -lgomp
 #CFLAGS	= -O3 -UNDEBUG -Wall $(XXCFLAGS)
-CFLAGS	= -g -UNDEBUG -Wall $(XXCFLAGS)
+CFLAGS	= -O3 -fopenmp -UNDEBUG -Wall $(XXCFLAGS)
 BUILD_DIR	= ..
 INCLUDES	= -I.
 
@@ -67,6 +67,7 @@
 HDR	= pthread.h semaphore.h sched.h
 LIB	= libpthread$(GCX).a
 DLL	= pthread$(GCX).dll
+# The next path is relative to $BUILD_DIR
 QAPC	= ../QueueUserAPCEx/User/quserex.dll
 
 COPYFILES	= $(HDR) $(LIB) $(DLL) $(QAPC)
@@ -74,7 +75,8 @@
 # If a test case returns a non-zero exit code to the shell, make will
 # stop.
 
-TESTS	= sizes loadfree \
+TESTS	= \
+	  sizes loadfree \
 	  self1 mutex5 mutex1 mutex1e mutex1n mutex1r \
 	  semaphore1 semaphore2 semaphore3 \
 	  condvar1 condvar1_1 condvar1_2 condvar2 condvar2_1 exit1 \
@@ -90,7 +92,45 @@
 	  once1 once2 once3 once4 self2 \
 	  cancel1 cancel2 \
 	  semaphore4 semaphore4t semaphore5 \
-	  barrier1 barrier2 barrier3 barrier4 barrier5 \
+	  barrier1 barrier2 barrier3 barrier4 barrier5 barrier6 \
+	  tsd1 tsd2 openmp1 delay1 delay2 eyal1 \
+	  condvar3 condvar3_1 condvar3_2 condvar3_3 \
+	  condvar4 condvar5 condvar6 condvar7 condvar8 condvar9 \
+	  errno1 \
+	  rwlock1 rwlock2 rwlock3 rwlock4 rwlock5 rwlock6 rwlock7 rwlock8 \
+	  rwlock2_t rwlock3_t rwlock4_t rwlock5_t rwlock6_t rwlock6_t2 \
+	  context1 cancel3 cancel4 cancel5 cancel6a cancel6d \
+	  cancel7 cancel8 \
+	  cleanup0 cleanup1 cleanup2 cleanup3 \
+	  priority1 priority2 inherit1 \
+	  spin1 spin2 spin3 spin4 \
+	  exception1 exception2 exception3 \
+	  cancel9 create3 stress1
+
+STRESSTESTS = \
+	stress1
+
+BENCHTESTS = \
+	benchtest1 benchtest2 benchtest3 benchtest4 benchtest5 benchtest6
+
+STATICTESTS = \
+	  sizes \
+	  self1 mutex5 mutex1 mutex1e mutex1n mutex1r \
+	  semaphore1 semaphore2 semaphore3 \
+	  condvar1 condvar1_1 condvar1_2 condvar2 condvar2_1 exit1 \
+	  create1 create2 reuse1 reuse2 equal1 \
+	  kill1 valid1 valid2 \
+	  exit2 exit3 exit4 exit5 \
+	  join0 join1 detach1 join2 join3 \
+	  mutex2 mutex2r mutex2e mutex3 mutex3r mutex3e \
+	  mutex4 mutex6 mutex6n mutex6e mutex6r \
+	  mutex6s mutex6es mutex6rs \
+	  mutex7 mutex7n mutex7e mutex7r mutex8 mutex8n mutex8e mutex8r \
+	  count1 \
+	  once1 once2 once3 once4 self2 \
+	  cancel1 cancel2 \
+	  semaphore4 semaphore4t semaphore5 \
+	  barrier1 barrier2 barrier3 barrier4 barrier5 barrier6 \
 	  tsd1 tsd2 delay1 delay2 eyal1 \
 	  condvar3 condvar3_1 condvar3_2 condvar3_3 \
 	  condvar4 condvar5 condvar6 condvar7 condvar8 condvar9 \
@@ -105,15 +145,6 @@
 	  exception1 exception2 exception3 \
 	  cancel9 create3 stress1
 
-STRESSTESTS = \
-	stress1
-
-BENCHTESTS = \
-	benchtest1 benchtest2 benchtest3 benchtest4 benchtest5
-
-STATICTESTS = \
-	self1
-
 PASSES		= $(TESTS:%=%.pass)
 BENCHRESULTS	= $(BENCHTESTS:%=%.bench)
 STRESSRESULTS	= $(STRESSTESTS:%=%.pass)
@@ -184,12 +215,14 @@
 benchtest3.bench:
 benchtest4.bench:
 benchtest5.bench:
+benchtest6.bench:
 
 barrier1.pass: semaphore4.pass
 barrier2.pass: barrier1.pass
 barrier3.pass: barrier2.pass
 barrier4.pass: barrier3.pass
 barrier5.pass: barrier4.pass
+barrier6.pass: barrier5.pass
 cancel1.pass: create1.pass
 cancel2.pass: cancel1.pass
 cancel2_1.pass: cancel2.pass
@@ -277,6 +310,7 @@
 once2.pass: once1.pass
 once3.pass: once2.pass
 once4.pass: once3.pass
+openmp1.pass: tsd2.pass
 priority1.pass: join1.pass
 priority2.pass: priority1.pass barrier3.pass
 reuse1.pass: create2.pass
@@ -345,7 +379,7 @@
 	@ $(CC) -S $(CFLAGS) -o $@ $< $(INCLUDES)
 
 $(COPYFILES):
-	@ $(ECHO) Copying $@
+	@ $(ECHO) Copying $(BUILD_DIR)/$@
 	@ $(CP) $(BUILD_DIR)/$@ .
 
 benchlib.o: benchlib.c
@@ -366,6 +400,7 @@
 	- $(RM) *.e
 	- $(RM) *.i
 	- $(RM) *.o
+	- $(RM) *.so
 	- $(RM) *.obj
 	- $(RM) *.pdb
 	- $(RM) *.exe