summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/runtest6
-rwxr-xr-xbin/snapshot17
2 files changed, 21 insertions, 2 deletions
diff --git a/bin/runtest b/bin/runtest
index 75e78dc..ba49faa 100755
--- a/bin/runtest
+++ b/bin/runtest
@@ -341,6 +341,11 @@ RUNSNAPTEST()
shift
SNAPCMD_OPT="$SNAPCMD_OPT deploy $1"
;;
+ deploydir)
+ # default directory for deployment.
+ shift
+ SNAPCMD_OPT="$SNAPCMD_OPT deploydir $1"
+ ;;
*) # unknown test
PRINT "$0: unknown type of test ($1)"
retcode=1
@@ -420,6 +425,7 @@ RUNSNAPTEST()
# skip skip this test
# srcdirname <name> use <name> as the build-directory.
# deploy <name> deploy the built binary at directory <name>.
+# deploydir <name> use <name> as the default directory for deployment.
SNAPTEST_CONFIG_PARSE()
{
while read x y ; do
diff --git a/bin/snapshot b/bin/snapshot
index f2b98c2..eee8bbc 100755
--- a/bin/snapshot
+++ b/bin/snapshot
@@ -83,6 +83,7 @@ while [ $# -gt 0 ] ; do
cmd=""
;;
deploy)
+ # deploy the built binary.
shift
if [ $# -lt 1 ]; then
echo "deploy <dir> missing"
@@ -93,6 +94,17 @@ while [ $# -gt 0 ] ; do
cmddeploy="deploy"
DEPLOYDIRNAME="$1"
;;
+ deploydir)
+ # default directory for deployment.
+ shift
+ if [ $# -lt 1 ]; then
+ echo "deploydir <dir> missing"
+ errcode=1
+ cmd="help"
+ break
+ fi
+ deploydir="$1"
+ ;;
test)
cmdtest="test"
cmd=""
@@ -199,7 +211,7 @@ if [ "$cmd" = help ]; then
set -
cat <<EOF
Usage: $PROGNAME [all] [checkout] [diff] [test] [srcdir] [release] [help]
- [clean] [distclean] [echo] [deploy <dir>]
+ [clean] [distclean] [echo] [deploy <dir>] [deploydir <dir>]
[zlib <zlib_path>] [archive <arch_path>] [srcdirname <dir>]
[op-configure <option>] [--<option>]
all: Run all commands (checkout, test & release)
@@ -208,6 +220,7 @@ Usage: $PROGNAME [all] [checkout] [diff] [test] [srcdir] [release] [help]
diff: Run diff on current and previous versions. Exit 0 if
no significant differences are found. Otherwise, non-zero.
deploy: deploy binary to directory <dir>
+ deploydir: use <dir> as the default directory for deployment
test: Run test
release: Run release
clean: Run make clean
@@ -399,7 +412,7 @@ fi # Test the HDF5 library
if [ -n "$DEPLOYDIRNAME" ]; then
if [ "$snapshot" = "yes" ]; then
TIMESTAMP "deploy"
- if (cd ${TESTDIR} && ${CURRENT}/bin/deploy ${DEPLOYDIRNAME}); then
+ if (cd ${TESTDIR} && ${CURRENT}/bin/deploy ${deploydir}/${DEPLOYDIRNAME}); then
errcode=$?
exit $errcode
fi