From 7170a28d46d5db1e7a9da24a5555a194a233ef0b Mon Sep 17 00:00:00 2001
From: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Date: Mon, 19 Oct 2020 12:14:25 +0200
Subject: 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>
---
 tests/ubi-tests/Makemodule.am         | 12 ++----------
 tests/ubi-tests/runubitests.sh.in     |  6 +-----
 tests/ubi-tests/ubi-stress-test.sh.in |  6 +-----
 3 files changed, 4 insertions(+), 20 deletions(-)

(limited to 'tests/ubi-tests')

diff --git a/tests/ubi-tests/Makemodule.am b/tests/ubi-tests/Makemodule.am
index fe835ed..13d7b08 100644
--- a/tests/ubi-tests/Makemodule.am
+++ b/tests/ubi-tests/Makemodule.am
@@ -54,17 +54,9 @@ rsvol_SOURCES += tests/ubi-tests/helpers.h
 rsvol_LDADD = libubi.a
 rsvol_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/ubi-utils/include
 
-UBITEST_BINS = \
+test_PROGRAMS += \
 	io_basic io_update io_paral io_read volrefcnt integ \
 	mkvol_basic mkvol_bad mkvol_paral rsvol
 
-UBITEST_SH = \
+test_SCRIPTS += \
 	tests/ubi-tests/runubitests.sh tests/ubi-tests/ubi-stress-test.sh
-
-if INSTALL_TESTS
-pkglibexec_SCRIPTS += $(UBITEST_SH)
-pkglibexec_PROGRAMS += $(UBITEST_BINS)
-else
-noinst_SCRIPTS += $(UBITEST_SH)
-noinst_PROGRAMS += $(UBITEST_BINS)
-endif
diff --git a/tests/ubi-tests/runubitests.sh.in b/tests/ubi-tests/runubitests.sh.in
index a1b23c4..1675308 100755
--- a/tests/ubi-tests/runubitests.sh.in
+++ b/tests/ubi-tests/runubitests.sh.in
@@ -1,10 +1,6 @@
 #!/bin/sh -euf
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libexecpath=@libexecdir@/mtd-utils
-TESTBINDIR=@testbindir@
+TESTBINDIR=@TESTBINDIR@
 
 tests="mkvol_basic mkvol_bad mkvol_paral rsvol io_basic io_read io_update io_paral volrefcnt"
 
diff --git a/tests/ubi-tests/ubi-stress-test.sh.in b/tests/ubi-tests/ubi-stress-test.sh.in
index 657ef4b..e178076 100755
--- a/tests/ubi-tests/ubi-stress-test.sh.in
+++ b/tests/ubi-tests/ubi-stress-test.sh.in
@@ -1,10 +1,6 @@
 #!/bin/sh -euf
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libexecpath=@libexecdir@/mtd-utils
-TESTBINDIR=@testbindir@
+TESTBINDIR=@TESTBINDIR@
 
 fatal()
 {
-- 
cgit v1.2.3