1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
|
--- ./tests/Makefile.orig 2012-03-24 00:29:46.423575940 +0100
+++ ./tests/Makefile 2012-03-24 00:36:20.735581609 +0100
@@ -2,8 +2,10 @@
# Default variable settings
MPIRUN="mpirun ./xaces3 >./job.out"
-RUN_COMPARE="mpirun .xtest_compare "
+RUN_COMPARE="mpirun ./xtest_compare "
ENV_VARS=" "
+SET_ACES_EXE_PATH=setenv ACES_EXE_PATH
+WORKDIR=`pwd`/..
# Machine-specific variable settings
@@ -144,16 +146,7 @@
INSTALL_DIR=$(WORKDIR)/ACESIII_TESTS
ACES3_EXE=$(shell pwd)/../bin
GENBAS=./GENBAS
-TESTS=1.1.1.1 1.1.2.1 1.1.2.2 1.1.3.1 1.1.3.2 1.1.4.1 1.1.4.2 \
- 1.2.1.1 1.2.2.1 1.2.3.1 1.2.3.2 \
- 1.3.1.1 1.3.2.1 \
- 1.4.3.1 1.4.3.2 \
- 2.1.1.1 2.1.2.1 2.1.2.2 2.1.3.1 2.1.3.2 2.1.4.1 2.1.4.2 \
- 2.2.1.1 2.2.2.1 2.2.3.1 2.2.3.2 \
- 2.3.1.1 2.3.2.1 \
- 2.4.3.1 2.4.3.2 \
- 3.1.1.1 3.1.2.1 3.1.3.1 3.1.3.2 3.1.4.1 3.1.4.2 \
- 3.2.1.1 3.2.1.2 3.2.2.1 3.2.2.2 3.2.3.1
+TESTS=1.1.1.1
all: tests scripts
@@ -165,7 +158,9 @@
@mkdir $(INSTALL_DIR) ;
@for mytest in $(TESTS) ; \
do mkdir $(INSTALL_DIR)/$$mytest || exit 1; \
- cp $(GENBAS) $(ACES3_EXE)/xaces3 $(ACES3_EXE)/xtest_compare $(INSTALL_DIR)/$$mytest || exit 1; \
+ ln -s $(ACES3_EXE)/../tests/$(GENBAS) $(INSTALL_DIR)/$$mytest || exit 1; \
+ ln -s $(ACES3_EXE)/xaces3 $(INSTALL_DIR)/$$mytest || exit 1; \
+ ln -s $(ACES3_EXE)/xtest_compare $(INSTALL_DIR)/$$mytest || exit 1; \
cp zmat_$$mytest $(INSTALL_DIR)/$$mytest/ZMAT || exit 1; \
done
@@ -185,8 +180,7 @@
do echo >>runscript ; \
echo \#\#\# Test $$test \#\#\# >>runscript ; \
echo cd $(INSTALL_DIR)/$$test >>runscript ; \
- echo lfs setstripe BLOCKDATA 0 -1 -1 >>runscript ; \
- echo lfs setstripe BLOCKDATA2 0 -1 -1 >>runscript ; \
+ echo "echo Running $$test" >>runscript ; \
echo "echo Running $$test >>../monitor_tests" >>runscript ; \
echo "date >>../monitor_tests" >>runscript ; \
echo $(MPIRUN) >>runscript ; \
|