diff options
Diffstat (limited to 'extras/distributed-testing')
| -rw-r--r-- | extras/distributed-testing/distributed-test-build-env | 3 | ||||
| -rw-r--r-- | extras/distributed-testing/distributed-test-env | 59 | ||||
| -rwxr-xr-x | extras/distributed-testing/distributed-test-runner.py | 16 |
3 files changed, 40 insertions, 38 deletions
diff --git a/extras/distributed-testing/distributed-test-build-env b/extras/distributed-testing/distributed-test-build-env index 4046eee8b40..cd68ff717da 100644 --- a/extras/distributed-testing/distributed-test-build-env +++ b/extras/distributed-testing/distributed-test-build-env @@ -1,8 +1,7 @@ #!/bin/bash GF_CONF_OPTS="--localstatedir=/var --sysconfdir /var/lib --prefix /usr --libdir /usr/lib64 \ - --enable-fusermount --enable-mempool --enable-api --with-jemalloc\ - --disable-tiering --with-ipv6-default --enable-gnfs" + --enable-bd-xlator=yes --enable-debug --enable-gnfs" if [ -x /usr/lib/rpm/redhat/dist.sh ]; then REDHAT_MAJOR=$(/usr/lib/rpm/redhat/dist.sh --distnum) diff --git a/extras/distributed-testing/distributed-test-env b/extras/distributed-testing/distributed-test-env index 6736503e4fa..36fdd82e5dd 100644 --- a/extras/distributed-testing/distributed-test-env +++ b/extras/distributed-testing/distributed-test-env @@ -12,36 +12,35 @@ KNOWN_FLAKY_TESTS="\ " BROKEN_TESTS="\ -tests/features/lock_revocation.t\ -tests/features/recon.t\ -tests/features/fdl-overflow.t\ -tests/features/fdl.t\ -tests/features/ipc.t\ -tests/bugs/distribute/bug-1247563.t\ -tests/bugs/distribute/bug-1543279.t\ -tests/bugs/distribute/bug-1066798.t\ -tests/bugs/ec/bug-1304988.t\ -tests/bugs/unclassified/bug-1357397.t\ -tests/bugs/quota/bug-1235182.t\ -tests/bugs/fuse/bug-1309462.t\ -tests/bugs/glusterd/bug-1238706-daemons-stop-on-peer-cleanup.t\ -tests/bugs/stripe/bug-1002207.t\ -tests/bugs/stripe/bug-1111454.t\ -tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t\ -tests/bugs/write-behind/bug-1279730.t\ -tests/bugs/gfapi/bug-1093594.t\ -tests/bugs/replicate/bug-1473026.t\ -tests/bugs/replicate/bug-802417.t\ -tests/encryption/crypt.t\ -tests/basic/inode-leak.t\ -tests/basic/distribute/force-migration.t\ -tests/basic/ec/heal-info.t\ -tests/basic/ec/ec-seek.t\ -tests/basic/jbr/jbr-volgen.t\ -tests/basic/jbr/jbr.t\ -tests/basic/afr/tarissue.t\ -tests/basic/tier/tierd_check.t\ -tests/basic/gfapi/bug1291259.t\ + tests/features/lock_revocation.t\ + tests/features/recon.t\ + tests/features/fdl-overflow.t\ + tests/features/fdl.t\ + tests/features/ipc.t\ + tests/bugs/distribute/bug-1247563.t\ + tests/bugs/distribute/bug-1543279.t\ + tests/bugs/distribute/bug-1066798.t\ + tests/bugs/ec/bug-1304988.t\ + tests/bugs/unclassified/bug-1357397.t\ + tests/bugs/quota/bug-1235182.t\ + tests/bugs/fuse/bug-1309462.t\ + tests/bugs/glusterd/bug-1238706-daemons-stop-on-peer-cleanup.t\ + tests/bugs/stripe/bug-1002207.t\ + tests/bugs/stripe/bug-1111454.t\ + tests/bugs/snapshot/bug-1140162-file-snapshot-features-encrypt-opts-validation.t\ + tests/bugs/write-behind/bug-1279730.t\ + tests/bugs/gfapi/bug-1093594.t\ + tests/bugs/replicate/bug-1473026.t\ + tests/bugs/replicate/bug-802417.t\ + tests/basic/inode-leak.t\ + tests/basic/distribute/force-migration.t\ + tests/basic/ec/heal-info.t\ + tests/basic/ec/ec-seek.t\ + tests/basic/jbr/jbr-volgen.t\ + tests/basic/jbr/jbr.t\ + tests/basic/afr/tarissue.t\ + tests/basic/tier/tierd_check.t\ + tests/basic/gfapi/bug1291259.t\ " SMOKE_TESTS=$(echo $SMOKE_TESTS | tr -s ' ' ' ') diff --git a/extras/distributed-testing/distributed-test-runner.py b/extras/distributed-testing/distributed-test-runner.py index b2cf32ef1bb..5a07e2feab1 100755 --- a/extras/distributed-testing/distributed-test-runner.py +++ b/extras/distributed-testing/distributed-test-runner.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 from __future__ import absolute_import from __future__ import division @@ -37,7 +37,7 @@ def socket_instance(address_family): elif address_family.upper() == 'ipv6'.upper(): return socket.socket(socket.AF_INET6, socket.SOCK_STREAM) else: - Log.error("Invalid IP addess family") + Log.error("Invalid IP address family") sys.exit(1) @@ -383,14 +383,17 @@ class Handlers: return self.shell.call("make install") == 0 @synchronized - def prove(self, id, test, timeout, valgrind=False, asan_noleaks=True): + def prove(self, id, test, timeout, valgrind="no", asan_noleaks=True): assert id == self.client_id self.shell.cd(self.gluster_root) env = "DEBUG=1 " - if valgrind: + if valgrind == "memcheck" or valgrind == "yes": cmd = "valgrind" cmd += " --tool=memcheck --leak-check=full --track-origins=yes" cmd += " --show-leak-kinds=all -v prove -v" + elif valgrind == "drd": + cmd = "valgrind" + cmd += " --tool=drd -v prove -v" elif asan_noleaks: cmd = "prove -v" env += "ASAN_OPTIONS=detect_leaks=0 " @@ -827,8 +830,9 @@ parser.add_argument("--port", help="server port to listen", type=int, default=DEFAULT_PORT) # test role parser.add_argument("--tester", help="start tester", action="store_true") -parser.add_argument("--valgrind", help="run tests under valgrind", - action="store_true") +parser.add_argument("--valgrind[=memcheck,drd]", + help="run tests with valgrind tool 'memcheck' or 'drd'", + default="no") parser.add_argument("--asan", help="test with asan enabled", action="store_true") parser.add_argument("--asan-noleaks", help="test with asan but no mem leaks", |