Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
b=20748
[fs/lustre-release.git]
/
lustre
/
tests
/
conf-sanity.sh
diff --git
a/lustre/tests/conf-sanity.sh
b/lustre/tests/conf-sanity.sh
index
c7affc9
..
3c233eb
100644
(file)
--- a/
lustre/tests/conf-sanity.sh
+++ b/
lustre/tests/conf-sanity.sh
@@
-973,7
+973,7
@@
cleanup_32() {
test_32a() {
# this test is totally useless on a client-only system
test_32a() {
# this test is totally useless on a client-only system
-
[ -n "$CLIENTONLY" -o -n "$CLIENTMODSONLY" ]
&& skip "client only testing" && return 0
+
client_only
&& skip "client only testing" && return 0
[ "$NETTYPE" = "tcp" ] || { skip "NETTYPE != tcp" && return 0; }
[ -z "$TUNEFS" ] && skip_env "No tunefs" && return 0
[ "$NETTYPE" = "tcp" ] || { skip "NETTYPE != tcp" && return 0; }
[ -z "$TUNEFS" ] && skip_env "No tunefs" && return 0
@@
-1031,7
+1031,7
@@
run_test 32a "Upgrade from 1.8 (not live)"
test_32b() {
# this test is totally useless on a client-only system
test_32b() {
# this test is totally useless on a client-only system
-
[ -n "$CLIENTONLY" -o -n "$CLIENTMODSONLY" ]
&& skip "client only testing" && return 0
+
client_only
&& skip "client only testing" && return 0
[ "$NETTYPE" = "tcp" ] || { skip "NETTYPE != tcp" && return 0; }
[ -z "$TUNEFS" ] && skip_env "No tunefs" && return
[ "$NETTYPE" = "tcp" ] || { skip "NETTYPE != tcp" && return 0; }
[ -z "$TUNEFS" ] && skip_env "No tunefs" && return
@@
-1310,7
+1310,7
@@
test_36() { # 12743
run_test 36 "df report consistency on OSTs with different block size"
test_37() {
run_test 36 "df report consistency on OSTs with different block size"
test_37() {
-
[ -n "$CLIENTONLY" -o -n "$CLIENTMODSONLY" ]
&& skip "client only testing" && return 0
+
client_only
&& skip "client only testing" && return 0
LOCAL_MDSDEV="$TMP/mdt.img"
SYM_MDSDEV="$TMP/sym_mdt.img"
LOCAL_MDSDEV="$TMP/mdt.img"
SYM_MDSDEV="$TMP/sym_mdt.img"