Proposed re-write of tools/testharness.py

Makefile.in

@@ -1,5 +1,5 @@
 #    Copyright (C) 2006 Imperial College London and others.
-#    
+#
 #    Please see the AUTHORS file in the main source directory for a full list
 #    of copyright holders.
 #
@@ -9,7 +9,7 @@
 #    Imperial College London
 #
 #    amcgsoftware@imperial.ac.uk
-#    
+#
 #    This library is free software; you can redistribute it and/or
 #    modify it under the terms of the GNU Lesser General Public
 #    License as published by the Free Software Foundation,
@@ -88,8 +88,8 @@ ifeq (@MBA3D@,yes)
 LIBMBA3D = lib/libmba3d.a
 endif
 
-# Thread count for make test.
-THREADS=1
+# Core count for make test.
+CORES=8
 
 EXCLUDE_TAGS =
 ifneq (@HAVE_ZOLTAN@,yes)
@@ -190,14 +190,14 @@ static: fluidity_library
 
 shared: lib/shared/$(SLIB_FLUIDITY).1
 
-lib/shared/$(SLIB_FLUIDITY).1: fluidity_library 
+lib/shared/$(SLIB_FLUIDITY).1: fluidity_library
 	@echo "BUILD shared libfluidity"
 	@rm -rf tmp
 	@mkdir -p tmp lib/shared
 	@cp $(LIB_FLUIDITY) tmp
 	@cd tmp; ar x lib$(FLUIDITY).a; rm lib$(FLUIDITY).a; cd ..
 	@echo "    LD lib$(FLUIDITY).so"
-	@$(EVAL) $(LINKER) -shared -Wl,-soname,$(SLIB_FLUIDITY).1 -o lib/shared/$(SLIB_FLUIDITY).1 tmp/* -L./lib -lvtkfortran 
+	@$(EVAL) $(LINKER) -shared -Wl,-soname,$(SLIB_FLUIDITY).1 -o lib/shared/$(SLIB_FLUIDITY).1 tmp/* -L./lib -lvtkfortran
 	@rm -rf tmp
 	@cd lib/shared; ln -sf $(SLIB_FLUIDITY).1 $(SLIB_FLUIDITY); cd ../..
 
@@ -299,7 +299,7 @@ endif
 
 
 
-fldecomp: fluidity_library 
+fldecomp: fluidity_library
 	@echo "BUILD fldecomp"
 	@echo "    MKDIR bin"
 	@mkdir -p bin
@@ -381,11 +381,11 @@ endif
 
 clean-debian:
 	@echo "    CLEAN debian"
-	@cd debian; rm -rf files tmp fluidity python-fluidity *.substvars *.debhelper* 
+	@cd debian; rm -rf files tmp fluidity python-fluidity *.substvars *.debhelper*
 
-clean-test:      
+clean-test:
 	@echo "    CLEAN tests"
-	@cd tests; PYTHONPATH=../python ../tools/testharness.py --clean >/dev/null
+	@cd tests; ../tools/testharness.py --clean >/dev/null
 	@cd tests/data; $(MAKE) clean
 
 clean-unittest:
@@ -404,13 +404,11 @@ clean-unittest:
 	@echo "    CLEAN ocean_forcing/tests"
 	@cd ocean_forcing/tests;   $(MAKE) clean
 
-clean-all-tests: clean-test     
+clean-all-tests: clean-test
 	@echo "    CLEAN parallel/special/long tests"
-	@PYTHONPATH=python tools/testharness.py --parallelism=parallel --clean >/dev/null
 	@PYTHONPATH=python tools/testharness.py --length=special --clean >/dev/null
-	@PYTHONPATH=python tools/testharness.py --length=special --parallelism=parallel --clean >/dev/null
 	@PYTHONPATH=python tools/testharness.py --length=long --clean >/dev/null
-	@PYTHONPATH=python tools/testharness.py --length=long --parallelism=parallel --clean >/dev/null
+	@PYTHONPATH=python tools/testharness.py --length=vlong --clean >/dev/null
 
 distclean: clean
 	@echo "    DISTCLEAN"
@@ -451,21 +449,19 @@ distclean: clean
 	@find ./ \( -name make.log \) -exec rm -f {} \; > /dev/null
 	@rm -f Makefile > /dev/null
 
-test: serialtest
-
-serialtest: fltools bin/$(FLUIDITY)
-	@cd tests; ../bin/testharness -x test_results.xml -l short $(EXCLUDE_TAGS) -n $(THREADS)
+test: fltools bin/$(FLUIDITY)
+	@cd tests; ../bin/testharness -x shorttests.xml -l short $(EXCLUDE_TAGS) -n $(CORES)
 
 mediumtest: fltools bin/$(FLUIDITY) manual spudtools
-	@cd tests; ../bin/testharness -x test_results_medium.xml -l medium $(EXCLUDE_TAGS) -n $(THREADS)
+	@cd tests; ../bin/testharness -x mediumtests.xml -l medium $(EXCLUDE_TAGS) -n $(CORES)
 
 .PHONY: spudtools
 
 spudtools:
 	@cd libspud ; $(MAKE) install-spudtools
 	@echo "    INSTALL spudtools"
 
-setuputs: 
+setuputs:
 	@echo "SETUP tests"
 	@echo "    RMDIR bin/tests"
 	@rm -rf bin/tests
@@ -494,7 +490,7 @@ endif
 
 unittest: build_unittest
 	@echo "RUN bin/tests"
-	@bin/unittestharness -d bin/tests -x tests/test_results_unittests.xml
+	@bin/unittestharness -d bin/tests -x tests/unittests.xml
 
 bin/spud-preprocess:
 	@echo "Installing spudtools"
@@ -543,14 +539,14 @@ endif
 	@cd diagnostics;   	../bin/create_makefile --exclude \
 	"Diagnostic_Fields_Interfaces.F90 Diagnostic_Fields_New.F90" $(TESTOPTS)
 	@cd diagnostics;   	$(MAKE) Diagnostic_Fields_Interfaces.o \
-	Diagnostic_Fields_New.o 
+	Diagnostic_Fields_New.o
 	@echo "    Generating main dependencies"
 	@cd main; ../bin/create_makefile --exclude test_coupler.F90 $(TESTOPTS)
 	@echo "    Cleaning up the mess"
 	$(MAKE) clean-light
 	@echo "    Congratulations, make makefiles succeeded!"
 
-install: default fltools 
+install: default fltools
 	@mkdir -p $(DESTDIR)$(bindir) $(DESTDIR)$(docdir)/fluidity
 	find bin/ -maxdepth 1 -type f -exec cp '{}' $(DESTDIR)$(bindir) \;
 	rm -f $(DESTDIR)$(bindir)/spud-* $(DESTDIR)$(bindir)/diamond $(DESTDIR)$(bindir)/silenteval
@@ -566,7 +562,7 @@ install: default fltools
 	cd $(DESTDIR)$(docdir)/fluidity ; tar -czvf $(DESTDIR)$(docdir)/fluidity/examples.tar.gz examples/
 	rm -rf $(DESTDIR)$(docdir)/fluidity/examples/
 
-install-diamond: 
+install-diamond:
 	cd libspud; ./configure --prefix=@prefix@; cd ../..
 	cd libspud; $(MAKE) clean; cd ../..
 	cd libspud; $(MAKE) install-diamond; cd ../..

examples/top_hat/Makefile

@@ -2,16 +2,16 @@ include envcheck.mk
 
 preprocess: envcheck
 	@echo **********Generating a 1D mesh for the [0,3] interval:
-	${BINPREFIX}interval --dx=0.025 --reverse 0 3 line
-	${BINPREFIX}interval --dx=0.025 --reverse 0 3 line
+	interval --dx=0.025 --reverse 0 3 line
+	interval --dx=0.025 --reverse 0 3 line
 
 run: envcheck
 	@echo **********Running the Continuous Galerkin version of this example:
-	${BINPREFIX}fluidity -v2 -l top_hat_cg.flml
+	fluidity -v2 -l top_hat_cg.flml
 	@echo **********Running the Discontinuous Galerkin version of this example:
-	${BINPREFIX}fluidity -v2 -l top_hat_dg.flml
+	fluidity -v2 -l top_hat_dg.flml
 	@echo **********Running the Control Volumes version of this example:
-	${BINPREFIX}fluidity -v2 -l top_hat_cv.flml
+	fluidity -v2 -l top_hat_cv.flml
 
 postprocess: envcheck
 	@echo **********Calling visualise.py

examples/top_hat/envcheck.mk

@@ -9,8 +9,6 @@ TESTBINFLREDECOMP=$(shell which flredecomp >/dev/null ; echo $$?)
 TESTBINFLUIDITYLOCAL=$(shell test -x ../../bin/fluidity >/dev/null ; echo $$?)
 TESTBINFLREDECOMPLOCAL=$(shell test -x ../../bin/flredecomp >/dev/null ; echo $$?)
 
-BINPREFIX=$(shell test -x ../../bin/fluidity >/dev/null && echo ${PWD}/../../bin/)
-
 TESTBIN=${TESTBINFLUIDITY}${TESTBINFLREDECOMP}
 TESTBINLOCAL=${TESTBINFLUIDITYLOCAL}${TESTBINFLREDECOMPLOCAL}
 
@@ -32,7 +30,7 @@ ifneq (${TESTBIN},00)
     # No fluidity binary on the system path or locally
 	@echo "*** ERROR ***\nThe Fluidity binaries needed to run this example can't be found.\nTo fix this either:\n\n   (a) install the Fluidity binary package if you are on Ubuntu\n   (b) compile Fluidity from source and install it in a system-accessable\n         location\n   (c) set your PATH environment variable to point to a built version of\n         Fluidity.\n\nRefer to the Fluidity manual for more instructions on any of the above,\nor contact the fluidity@imperial.ac.uk mailing list.\n"
 	@exit 1
-   endif 
+   endif
   endif
  endif
  # Do we have both system AND local builds available?