summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2010-02-28 08:24:22 -0800
committerDan Nicholson <dbn.lists@gmail.com>2010-03-24 10:26:37 -0700
commitf16c1863906948f5f21577a749e0b162dfa66c2e (patch)
tree9d396181091240919d5c6a46ff38db44aee8008c
parentbfc10a5f72fe42402dadf1c30fce73d0221bd3af (diff)
xts5: Tweak the default output directory
Collect all the results under one directory instead of cluttering the current directory. Also, add the seconds to the date in the directory name to reduce the chance of conflict.
-rw-r--r--.gitignore2
-rw-r--r--README4
-rw-r--r--xts5/Makefile.am2
-rw-r--r--xts5/bin/xts-run.in2
4 files changed, 5 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 8a0eaeea..adc21530 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,4 +29,4 @@ ltmain.sh
missing
stamp-h1
tcc
-xts-20*
+results/
diff --git a/README b/README
index 226fdb9b..e8a3c2ea 100644
--- a/README
+++ b/README
@@ -41,8 +41,8 @@ A wrapper script, xts-run, is the easiest way to run the installed tests.
$ xts-run # run all the tests
$ xts-run XI # run just the XI test scenario
-The test output will go to a dated directory in the current directory by
-default. This can be changed with the xts-run -o parameter. The output
+By default, the test output will go to xts-results/<date> in the current
+directory. This can be changed with the xts-run -o parameter. The output
contains the full journal of all test output plus individual logs for
each test program. Journal files from completed runs can be analyzed by
the xts-report tool (formerly vswrpt):
diff --git a/xts5/Makefile.am b/xts5/Makefile.am
index 68b6be33..5249940c 100644
--- a/xts5/Makefile.am
+++ b/xts5/Makefile.am
@@ -38,7 +38,7 @@ XTS_CONFIG = TET_ROOT='$(top_srcdir)' XSET='$(XSET)' XDPYINFO='$(XDPYINFO)' \
tetexec.cfg: tetexec.cfg.in $(srcdir)/bin/xts-config
$(AM_V_GEN)$(XTS_CONFIG) < $< > $@.tmp && mv -f $@.tmp $@ || rm -f $@.tmp
check-local: tetexec.cfg
- @outdir="$(top_builddir)/xts-`date +%F-%R`"; \
+ @outdir="$(top_builddir)/results/`date +%F-%T`"; \
echo $(run_tcc) -i "$$outdir" xts5 $(scenario); \
$(run_tcc) -i "$$outdir" xts5 $(scenario); \
ret=$$?; \
diff --git a/xts5/bin/xts-run.in b/xts5/bin/xts-run.in
index 94fd83c2..e00438b7 100644
--- a/xts5/bin/xts-run.in
+++ b/xts5/bin/xts-run.in
@@ -77,7 +77,7 @@ else
fi
# Create the output directory
-[ -n "$outdir" ] || outdir="xts-`date +%F-%R`"
+[ -n "$outdir" ] || outdir="xts-results/`date +%F-%T`"
if [ ! -d "$outdir" ] && ! mkdir -p "$outdir"; then
echo "error: failed to create output directory $outdir" >&2
exit 1