diff options
| author | Niels de Vos <ndevos@redhat.com> | 2015-05-26 16:08:14 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-05-26 10:35:48 -0700 |
| commit | ec730faad06d14a226abc1174eb6f7afb965a69c (patch) | |
| tree | a0729b8d11a6158eed0b8ae4030c7efdfb2551b8 | |
| parent | 83777286f6ca1213509080ea8bcc43e8cd91db65 (diff) | |
tests: write log for glupy.t to the standard log directory
There is (or was) a spurious test in glupy.t for which a separate log
file was setup. The directory where the log is saved, is not available
on NetBSD and this causes glupy.t to always fail, without a log.
Instead of hard-coding the path to the log, use "gluster --print-logdir"
to provide a LOGDIR environment variable. glupy.t now writes the log to
an existing directory.
Cherry picked from commit cfca748fef28170377b868871b0dd980c1f151f6:
> BUG: 1163543
> Change-Id: Ifa73198d06fa267856d0da9d25a4380329909124
> Signed-off-by: Niels de Vos <ndevos@redhat.com>
> Reviewed-on: http://review.gluster.org/10801
> Tested-by: NetBSD Build System
> Tested-by: Gluster Build System <jenkins@build.gluster.com>
> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Change-Id: Ifa73198d06fa267856d0da9d25a4380329909124
BUG: 1225077
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/10920
Tested-by: NetBSD Build System
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
| -rwxr-xr-x | run-tests.sh | 2 | ||||
| -rwxr-xr-x | tests/features/glupy.t | 2 | ||||
| -rw-r--r-- | tests/include.rc | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/run-tests.sh b/run-tests.sh index 7675f102aea..5381c185cde 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -222,7 +222,7 @@ function is_bad_test () ./tests/bugs/disperse/bug-1187474.t \ ./tests/basic/afr/sparse-file-self-heal.t \ ./tests/basic/afr/data-self-heal.t \ - ./tests/features/glupy.t; do + ; do [ x"$name" = x"$bt" ] && return 0 # bash: zero means true/success done return 1 # bash: non-zero means false/failure diff --git a/tests/features/glupy.t b/tests/features/glupy.t index 2ff6430ec6a..faa4cf33a14 100755 --- a/tests/features/glupy.t +++ b/tests/features/glupy.t @@ -20,7 +20,7 @@ volume vol-glupy end-volume EOF -TEST glusterfs -f $B0/glupytest.vol -l /var/log/glusterfs/glupy.log $M0; +TEST glusterfs -f $B0/glupytest.vol -l $LOGDIR/glupy.log $M0; TEST touch $M0/filename; EXPECT "filename" ls $M0 diff --git a/tests/include.rc b/tests/include.rc index 8875f076ff1..3a54ee28f79 100644 --- a/tests/include.rc +++ b/tests/include.rc @@ -66,6 +66,8 @@ UMOUNT_TIMEOUT=5 CONFIG_UPDATE_TIMEOUT=5 AUTH_REFRESH_INTERVAL=10 +LOGDIR=$(gluster --print-logdir) + statedumpdir=`gluster --print-statedumpdir`; # Default directory for statedump CLI="gluster --mode=script --wignore"; |