aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Łyszczek <michal.lyszczek@gmail.com>2017-05-21 02:19:40 +0200
committerMichał Łyszczek <michal.lyszczek@gmail.com>2017-05-21 02:19:56 +0200
commit8e0e85149610a235484632a3bbc34c99fb7c05af (patch)
tree2224454ad69bd1c6a8e26ef20aa355e4762edc89
parentb5c43632486bf98b511ac26be33e8da3e3a892fb (diff)
downloadmemperf-8e0e85149610a235484632a3bbc34c99fb7c05af.tar.gz
memperf-8e0e85149610a235484632a3bbc34c99fb7c05af.tar.bz2
memperf-8e0e85149610a235484632a3bbc34c99fb7c05af.zip
rename tapdriver to test-driver as there was some weird errors
-rw-r--r--Makefile.am4
-rw-r--r--Makefile.in10
-rwxr-xr-xconfigure1
-rw-r--r--configure.ac1
-rwxr-xr-xtest-driver (renamed from tap-driver.sh)0
5 files changed, 6 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index 4b59c53..69ae745 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,9 +4,6 @@ memperf_SOURCES = src/bench.c \
src/opts.c \
src/utils.c
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
- $(top_srcdir)/tap-driver.sh
-
check_PROGRAMS = tests
tests_CFLAGS = -DTESTS -Wno-unused-value
TESTS = $(check_PROGRAMS)
@@ -15,3 +12,4 @@ tests_SOURCES = src/bench.c \
src/utils.c \
src/tests.c
+#man1_MANS = memperf.1
diff --git a/Makefile.in b/Makefile.in
index 51db206..7c105af 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -360,6 +360,7 @@ am__set_TESTS_bases = \
RECHECK_LOGS = $(TEST_LOGS)
TEST_SUITE_LOG = test-suite.log
TEST_EXTENSIONS = @EXEEXT@ .test
+LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
LOG_COMPILE = $(LOG_COMPILER) $(AM_LOG_FLAGS) $(LOG_FLAGS)
am__set_b = \
case '$@' in \
@@ -377,8 +378,8 @@ TEST_LOGS = $(am__test_logs2:.test.log=.log)
TEST_LOG_DRIVER = $(SHELL) $(top_srcdir)/test-driver
TEST_LOG_COMPILE = $(TEST_LOG_COMPILER) $(AM_TEST_LOG_FLAGS) \
$(TEST_LOG_FLAGS)
-am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in compile \
- depcomp install-sh missing tap-driver.sh test-driver
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
+ INSTALL compile depcomp install-sh missing test-driver
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
@@ -485,9 +486,6 @@ memperf_SOURCES = src/bench.c \
src/opts.c \
src/utils.c
-LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
- $(top_srcdir)/tap-driver.sh
-
tests_CFLAGS = -DTESTS -Wno-unused-value
TESTS = $(check_PROGRAMS)
tests_SOURCES = src/bench.c \
@@ -1233,6 +1231,8 @@ uninstall-am: uninstall-binPROGRAMS
.PRECIOUS: Makefile
+#man1_MANS = memperf.1
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/configure b/configure
index 09777ce..e5e4223 100755
--- a/configure
+++ b/configure
@@ -3626,7 +3626,6 @@ _ACEOF
fi
done
-
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/configure.ac b/configure.ac
index c533046..fc221e4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,6 @@ AC_CONFIG_HEADERS([config.h])
AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"])
AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS="$CFLAGS -Wextra"])
AC_CHECK_FUNCS(clock_gettime)
-AC_REQUIRE_AUX_FILE([tap-driver.sh])
AC_PROG_CC
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/tap-driver.sh b/test-driver
index 4254e2b..4254e2b 100755
--- a/tap-driver.sh
+++ b/test-driver