diff options
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | glusterfs.spec.in | 6 | ||||
| -rwxr-xr-x | run-tests.sh (renamed from run-tests.sh.in) | 5 | ||||
| -rw-r--r-- | tests.mk | 8 |
5 files changed, 9 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 2210492db86..598ebb4103c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,10 @@ -include $(top_srcdir)/tests.mk - EXTRA_DIST = autogen.sh \ COPYING-GPLV2 COPYING-LGPLV3 \ INSTALL README AUTHORS THANKS NEWS \ glusterfs.spec glusterfs-api.pc.in libgfchangelog.pc.in \ error-codes.json gf-error-codes.h.template \ - gen-headers.py + gen-headers.py run-tests.sh \ + $(shell find $(top_srcdir)/tests -type f -print) SUBDIRS = argp-standalone libglusterfs rpc api xlators glusterfsd \ $(FUSERMOUNT_SUBDIR) doc extras cli @SYNCDAEMON_SUBDIR@ diff --git a/configure.ac b/configure.ac index 940dde40c0f..e723dfabcf9 100644 --- a/configure.ac +++ b/configure.ac @@ -167,8 +167,7 @@ AC_CONFIG_FILES([Makefile geo-replication/Makefile geo-replication/src/Makefile geo-replication/syncdaemon/Makefile - glusterfs.spec - run-tests.sh]) + glusterfs.spec]) AC_CANONICAL_HOST diff --git a/glusterfs.spec.in b/glusterfs.spec.in index 39fc23aa645..96341adf9ec 100644 --- a/glusterfs.spec.in +++ b/glusterfs.spec.in @@ -588,6 +588,8 @@ touch %{buildroot}%{_sharedstatedir}/glusterd/options touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/nfs-server.vol touch %{buildroot}%{_sharedstatedir}/glusterd/nfs/run/nfs.pid +find ./tests ./run-tests.sh -type f | cpio -pd %{buildroot}%{_prefix}/share/glusterfs + %clean %{__rm} -rf %{buildroot} @@ -790,8 +792,8 @@ fi %files regression-tests %defattr(-,root,root,-) -%{_datarootdir}/glusterfs/* -%exclude %{_datarootdir}/glusterfs/tests/basic/rpm.t +%{_prefix}/share/glusterfs/* +%exclude %{_prefix}/share/glusterfs/tests/basic/rpm.t %post server # Legacy server diff --git a/run-tests.sh.in b/run-tests.sh index a75b68171ff..128404ed5e7 100755 --- a/run-tests.sh.in +++ b/run-tests.sh @@ -4,9 +4,8 @@ function _init() { - prefix="@prefix@"; - exec_prefix="@exec_prefix@"; - regression_testsdir="@datarootdir@/glusterfs"; + regression_testsdir=$(dirname $0); + if [ ! -f ${regression_testsdir}/tests/include.rc ]; then echo "Seems like GlusterFS quality tests are corrupted..aborting!!" exit 1 diff --git a/tests.mk b/tests.mk deleted file mode 100644 index 4760b76c825..00000000000 --- a/tests.mk +++ /dev/null @@ -1,8 +0,0 @@ -ALL_TEST_FILES = $(shell find $(top_srcdir)/tests -type f -print) - -regressiontestsdir = $(datarootdir)/glusterfs - -nobase_dist_regressiontests_DATA = $(ALL_TEST_FILES) run-tests.sh - -install-data-hook: - chmod +x $(DESTDIR)$(datarootdir)/glusterfs/run-tests.sh |