diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rwxr-xr-x | bin/snapshot | 25 | ||||
| -rw-r--r-- | config/commence.am | 4 | ||||
| -rw-r--r-- | config/conclude.am | 6 |
4 files changed, 24 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index b48bb30..7f872b0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -186,8 +186,10 @@ check-vfd: fi; \ done -# Run tests with different Virtual Object Layer Connectors. -check-vol: +# Run tests with different passthrough Virtual Object Layer Connectors. +# NOTE: Will only succeed with passthrough VOL connectors that use +# the native VOL connector as the terminal connector. +check-passthrough-vol: for d in $(SUBDIRS); do \ if test $$d != .; then \ (cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \ diff --git a/bin/snapshot b/bin/snapshot index 5900728..1218caa 100755 --- a/bin/snapshot +++ b/bin/snapshot @@ -130,10 +130,10 @@ DISPLAYUSAGE() set - cat <<EOF Usage: $PROGNAME [all] [checkout] [ftp <URL> [diff] [test] [srcdir] [release] [help] - [clean] [distclean] [echo] [deploy <dir>] [deploydir <dir>] - [zlib <zlib_path>] [releasedir <dir>] [srcdirname <dir>] [check-vfd] - [check-vol] - [exec <command>] [module-load <module-list>] [op-configure <option>] + [clean] [distclean] [echo] [deploy <dir>] [deploydir <dir>] + [zlib <zlib_path>] [releasedir <dir>] [srcdirname <dir>] [check-vfd] + [check-passthrough-vol] + [exec <command>] [module-load <module-list>] [op-configure <option>] [--<option>] all: Run all commands (checkout, test & release) [Default is all] @@ -150,8 +150,8 @@ Usage: $PROGNAME [all] [checkout] [ftp <URL> [diff] [test] [srcdir] [release] [h setenv <name> <value>: Set environment variable <name> to <value>. setenvN <N> <name> <value> ...: - Set environment variable with <N> values. - E.g., setenvN 3 x a b c is same as setenv x="a b c". + Set environment variable with <N> values. + E.g., setenvN 3 x a b c is same as setenv x="a b c". srcdir: Use srcdir option (does not imply other commands) "snapshot srcdir" is equivalent to "snapshot srcdir all" "snapshot srcdir checkout" is equivalent to "snapshot checkout" @@ -169,9 +169,12 @@ Usage: $PROGNAME [all] [checkout] [ftp <URL> [diff] [test] [srcdir] [release] [h Use <dir> as the release directory [Default is $ReleaseDir_default] check-vfd: - Run make check-vfd instead of just make check. - check-vol: - Run make check-vol instead of just make check. + Run make check-vfd instead of just make check. + check-passthrough-vol: + Run make check-passthrough-vol instead of just make check. + NOTE: Will only succeed with passthrough VOL connectors + that use the native VOL connector as the terminal + connector. exttest <testscript>; Run testscript; exec <command>: @@ -425,8 +428,8 @@ while [ $# -gt 0 ] ; do check-vfd) CHECKVAL=check-vfd ;; - check-vol) - CHECKVAL=check-vol + check-passthrough-vol) + CHECKVAL=check-passthrough-vol ;; module-load) shift diff --git a/config/commence.am b/config/commence.am index 5d88a88..a16eee5 100644 --- a/config/commence.am +++ b/config/commence.am @@ -97,8 +97,8 @@ CHECK_CLEANFILES=*.chkexe *.chklog *.clog *.clog2 # exists. .PHONY: build-check-clean build-check-p build-check-s build-lib build-progs \ build-tests check-clean check-install check-p check-s check-vfd \ - check-vol install-doc lib progs tests uninstall-doc _exec_check-s \ - _test help + check-passthrough-vol install-doc lib progs tests uninstall-doc \ + _exec_check-s _test help help: @$(top_srcdir)/bin/makehelp diff --git a/config/conclude.am b/config/conclude.am index 9da1da5..2eec03a 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -282,8 +282,10 @@ check-vfd: $(LIB) $(PROGS) $(chk_TESTS) fi; \ done -# Run test with different Virtual Object Layer Connector -check-vol: $(LIB) $(PROGS) $(chk_TESTS) +# Run test with different passthrough Virtual Object Layer Connector +# NOTE: Will only succeed with passthrough VOL connectors that use +# the native VOL connector as the terminal connector. +check-passthrough-vol: $(LIB) $(PROGS) $(chk_TESTS) @for vol in $(VOL_LIST) dummy; do \ if test "$$vol" != dummy; then \ echo "============================"; \ |