Further makefile reworking; removed loadfree test.

tests/Bmakefile

@@ -76,7 +76,7 @@ EHFLAGS	=
 # If a test case returns a non-zero exit code to the shell, make will
 # stop.
 
-PASSES=   loadfree.pass \
+PASSES=   \
 	  errno1.pass  \
 	  self1.pass  mutex5.pass  \
 	  mutex1.pass  mutex1n.pass  mutex1e.pass  mutex1r.pass  \
@@ -293,7 +293,6 @@ join2.pass: create1.pass
 join3.pass: join2.pass
 join4.pass: join3.pass
 kill1.pass: 
-loadfree.pass: pthread.dll
 mutex1.pass: self1.pass
 mutex1n.pass: mutex1.pass
 mutex1e.pass: mutex1.pass

tests/ChangeLog

@@ -2,11 +2,15 @@
 
 	* cancel1.c: Fix comment typo.
 	* Makefile: Adding functionality to support rapid turnaround of
-	individual or small sets of tests.
+	individual or small sets of tests; removed loadfree test.
 	* GNUmakefile: Likewise.
+	* Bmakefile: Removed loadfree test.
+	* Wmakefile: Likewise.
 	* common.mk: New makefile include file; split out common macros.
 	* runorder.mk: New makefile include file; split out run order rules
 	to allow selective inclusion.
+	* loadfree.c: Removed from suite; not required; unnecessarily
+	complicates the makefiles.
 
 2012-10-04  Ross Johnson <ross dot johnson at homemail dot com dot au>
 

tests/GNUmakefile

@@ -106,17 +106,16 @@ TESTS			= $(ALL_KNOWN_TESTS)
 BENCHRESULTS	= $(BENCHTESTS:%=%.bench)
 
 #
-# Define "FAST=foo bar" to build and run only the tests "foo.exe" and "bar.exe"
-# without any prerequisite tests. Set FAST to one or more tests.
+# To build and run "foo.exe" and "bar.exe" only use, e.g.:
+# make clean GC NO_DEPS=1 TESTS="foo bar"
 #
 # To build and run "foo.exe" and "bar.exe" and run all prerequisite tests
-# use "TESTS=foo bar". Set TESTS to one or more tests.
+# use, e.g.:
+# make clean GC TESTS="foo bar"
 #
-# You can't use FAST with TESTS.
+# Set TESTS to one or more tests.
 #
-ifdef FAST
-TESTS	= $(FAST)
-else
+ifndef NO_DEPS
 include runorder.mk
 endif
 

tests/Makefile

@@ -86,17 +86,16 @@ EHFLAGS		=
 include common.mk
 
 #
-# Define "FAST=foo bar" to build and run only the tests "foo.exe" and "bar.exe"
-# without any prerequisite tests. Set FAST to one or more tests.
+# To build and run "foo.exe" and "bar.exe" only use, e.g.:
+# nmake clean VC NO_DEPS=1 TESTS="foo bar"
 #
 # To build and run "foo.exe" and "bar.exe" and run all prerequisite tests
-# use "TESTS=foo bar". Set TESTS to one or more tests.
+# use, e.g.:
+# nmake clean VC TESTS="foo bar"
 #
-# You can't use FAST with TESTS.
+# Set TESTS to one or more tests.
 #
-!IFDEF FAST
-TESTS	= $(FAST)
-!ELSE
+!IFNDEF NO_DEPS
 include runorder.mk
 !ENDIF
 
@@ -271,7 +270,7 @@ include passes.mk
 # for certain tests, while others do. So the compile command is included in
 # the command list below and the dependency is commented out, which works.
 $(ALL_KNOWN_PASSES): #$(@R).exe
-	$(CC) /DPTW32_DLL_PATH="\"$(CPDLL)\"" $(EHFLAGS) $(CFLAGS) $(INCLUDES) $*.c /Fe$*.exe /link $(LFLAGS) $(CPLIB) $(XXLIBS)
+	$(CC) $(EHFLAGS) $(CFLAGS) $(INCLUDES) $*.c /Fe$*.exe /link $(LFLAGS) $(CPLIB) $(XXLIBS)
 	@ $(ECHO) ... Running $(TEST) test: $*.exe
 	@ .\$*.exe
 	@ $(ECHO) ...... Passed

tests/Wmakefile

@@ -79,7 +79,7 @@ EHFLAGS	=
 # If a test case returns a non-zero exit code to the shell, make will
 # stop.
 
-PASSES	= sizes.pass  loadfree.pass &
+PASSES	= sizes.pass  &
 	  self1.pass  mutex5.pass  &
 	  mutex1.pass  mutex1n.pass  mutex1e.pass  mutex1r.pass &
 	  semaphore1.pass  semaphore2.pass semaphore3.pass &
@@ -291,7 +291,6 @@ join2.pass: create1.pass
 join3.pass: join2.pass
 join4.pass: join3.pass
 kill1.pass: 
-loadfree.pass: pthread.dll
 mutex1.pass: self1.pass
 mutex1n.pass: mutex1.pass
 mutex1e.pass: mutex1.pass

tests/common.mk

@@ -20,7 +20,6 @@ ALL_KNOWN_TESTS = \
 	eyal1  \
 	join0  join1  join2 join3 join4  \
 	kill1  \
-	loadfree  \
 	mutex1  mutex1n  mutex1e  mutex1r  \
 	mutex2  mutex2r  mutex2e  mutex3  mutex3r  mutex3e  \
 	mutex4  mutex5  mutex6  mutex6n  mutex6e  mutex6r  \

tests/runorder.mk

@@ -55,7 +55,7 @@ create3.pass: create2.pass
 delay1.pass: self1.pass create3.pass
 delay2.pass: delay1.pass
 detach1.pass: join0.pass
-equal1.pass: create1.pass
+equal1.pass: self1.pass create1.pass
 errno1.pass: mutex3.pass
 exception1.pass: cancel4.pass
 exception2.pass: exception1.pass
@@ -64,7 +64,7 @@ exception3.pass: exception3_0.pass
 exit1.pass: self1.pass create3.pass
 exit2.pass: create1.pass
 exit3.pass: create1.pass
-exit4.pass: loadfree.pass self1.pass create3.pass 
+exit4.pass: self1.pass create3.pass 
 exit5.pass: exit4.pass kill1.pass
 eyal1.pass: self1.pass create3.pass mutex8.pass tsd1.pass
 inherit1.pass: join1.pass priority1.pass
@@ -73,8 +73,7 @@ join1.pass: create1.pass
 join2.pass: create1.pass
 join3.pass: join2.pass
 join4.pass: join3.pass
-kill1.pass: loadfree.pass
-loadfree.pass: sizes.pass
+kill1.pass: self1.pass
 mutex1.pass: mutex5.pass
 mutex1n.pass: mutex1.pass
 mutex1e.pass: mutex1.pass
@@ -86,7 +85,7 @@ mutex3.pass: create1.pass
 mutex3r.pass: mutex3.pass
 mutex3e.pass: mutex3.pass
 mutex4.pass: mutex3.pass
-mutex5.pass: loadfree.pass
+mutex5.pass: sizes.pass
 mutex6.pass: mutex4.pass
 mutex6n.pass: mutex4.pass
 mutex6e.pass: mutex4.pass
@@ -129,8 +128,8 @@ rwlock4_t.pass: rwlock3_t.pass
 rwlock5_t.pass: rwlock4_t.pass
 rwlock6_t.pass: rwlock5_t.pass
 rwlock6_t2.pass: rwlock6_t.pass
-self1.pass: loadfree.pass
-self2.pass: create1.pass
+self1.pass: sizes.pass
+self2.pass: self1.pass equal1.pass create1.pass
 semaphore1.pass: sizes.pass
 semaphore2.pass: semaphore1.pass
 semaphore3.pass: semaphore2.pass