aboutsummaryrefslogtreecommitdiff
path: root/tests/fs-tests
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2020-10-19 12:14:25 +0200
committerDavid Oberhollenzer <david.oberhollenzer@sigma-star.at>2021-01-20 12:01:53 +0100
commit7170a28d46d5db1e7a9da24a5555a194a233ef0b (patch)
treead9ef7d83143df6c5597473ef24b6bebbd7a6a63 /tests/fs-tests
parenta888044525d9f03290cc1afe62dcfa3bec4bc0b9 (diff)
Fix test binary installation
- Remove "install tests" configure option, we already have an option whether to build tests or not. Don't try to work around autotools semantics that people building the package expect. - Fix the installation path by propperly defining it and using the correct name for the libexec path. Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'tests/fs-tests')
-rw-r--r--tests/fs-tests/Makemodule.am12
-rwxr-xr-xtests/fs-tests/fs_help_all.sh.in6
-rwxr-xr-xtests/fs-tests/fs_run_all.sh.in6
-rwxr-xr-xtests/fs-tests/stress/fs_stress00.sh.in6
-rwxr-xr-xtests/fs-tests/stress/fs_stress01.sh.in6
5 files changed, 6 insertions, 30 deletions
diff --git a/tests/fs-tests/Makemodule.am b/tests/fs-tests/Makemodule.am
index 506dadc..0c58c9c 100644
--- a/tests/fs-tests/Makemodule.am
+++ b/tests/fs-tests/Makemodule.am
@@ -66,21 +66,13 @@ fstest_monitor_SOURCES = tests/fs-tests/utils/fstest_monitor.c
free_space_SOURCES = tests/fs-tests/utils/free_space.c
-FSTEST_BINS = \
+test_PROGRAMS += \
integck test_1 test_2 ftrunc perf orph \
stress_1 stress_2 stress_3 pdfrun gcd_hupper \
rndwrite00 fwrite00 rmdir00 rndrm00 rndrm99 \
fstest_monitor free_space
-FSTEST_SH = \
+test_SCRIPTS += \
tests/fs-tests/fs_help_all.sh tests/fs-tests/fs_run_all.sh \
tests/fs-tests/stress/fs_stress00.sh \
tests/fs-tests/stress/fs_stress01.sh
-
-if INSTALL_TESTS
-pkglibexec_SCRIPTS += $(FSTEST_SH)
-pkglibexec_PROGRAMS += $(FSTEST_BINS)
-else
-noinst_SCRIPTS += $(FSTEST_SH)
-noinst_PROGRAMS += $(FSTEST_BINS)
-endif
diff --git a/tests/fs-tests/fs_help_all.sh.in b/tests/fs-tests/fs_help_all.sh.in
index 39219b2..3898fbd 100755
--- a/tests/fs-tests/fs_help_all.sh.in
+++ b/tests/fs-tests/fs_help_all.sh.in
@@ -1,10 +1,6 @@
#!/bin/sh
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libexecpath=@libexecdir@/mtd-utils
-TESTBINDIR=@testbindir@
+TESTBINDIR=@TESTBINDIR@
echo -------------------------------------------------------------------------------
$TESTBINDIR/test_1 -h
diff --git a/tests/fs-tests/fs_run_all.sh.in b/tests/fs-tests/fs_run_all.sh.in
index a3676f9..f15a63b 100755
--- a/tests/fs-tests/fs_run_all.sh.in
+++ b/tests/fs-tests/fs_run_all.sh.in
@@ -1,10 +1,6 @@
#!/bin/sh
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libexecpath=@libexecdir@/mtd-utils
-TESTBINDIR=@testbindir@
+TESTBINDIR=@TESTBINDIR@
TEST_DIR=$TEST_FILE_SYSTEM_MOUNT_DIR
if test -z "$TEST_DIR";
diff --git a/tests/fs-tests/stress/fs_stress00.sh.in b/tests/fs-tests/stress/fs_stress00.sh.in
index 85ec7a2..f7d317c 100755
--- a/tests/fs-tests/stress/fs_stress00.sh.in
+++ b/tests/fs-tests/stress/fs_stress00.sh.in
@@ -1,10 +1,6 @@
#!/bin/sh
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libexecpath=@libexecdir@/mtd-utils
-TESTBINDIR=@testbindir@
+TESTBINDIR=@TESTBINDIR@
TEST_DIR=$TEST_FILE_SYSTEM_MOUNT_DIR
if test -z "$TEST_DIR";
diff --git a/tests/fs-tests/stress/fs_stress01.sh.in b/tests/fs-tests/stress/fs_stress01.sh.in
index d0ea8f9..da6babf 100755
--- a/tests/fs-tests/stress/fs_stress01.sh.in
+++ b/tests/fs-tests/stress/fs_stress01.sh.in
@@ -1,10 +1,6 @@
#!/bin/sh
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libexecpath=@libexecdir@/mtd-utils
-TESTBINDIR=@testbindir@
+TESTBINDIR=@TESTBINDIR@
TEST_DIR=$TEST_FILE_SYSTEM_MOUNT_DIR
if test -z "$TEST_DIR";