From 92e2863fb7ff857e424329508d32225eb9b3b3e9 Mon Sep 17 00:00:00 2001 From: Nikolaus Rath Date: Tue, 29 Mar 2016 14:17:16 -0700 Subject: Integrate tests with autotools --- configure.ac | 13 +++++++++---- test/.gitignore | 1 - test/Makefile | 7 ------- test/Makefile.am | 2 ++ 4 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 test/Makefile create mode 100644 test/Makefile.am diff --git a/configure.ac b/configure.ac index 29a281d..7ca9f4f 100644 --- a/configure.ac +++ b/configure.ac @@ -29,13 +29,15 @@ AC_ARG_ENABLE(util, [ --enable-util Compile with util ]) AC_ARG_ENABLE(example, [ --enable-example Compile with examples ]) +AC_ARG_ENABLE(test, + [ --enable-test Compile with tests ]) AC_ARG_ENABLE(mtab, [ --disable-mtab Disable and ignore usage of /etc/mtab ]) AC_ARG_WITH(pkgconfigdir, - [ --with-pkgconfigdir=DIR pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@], - [pkgconfigdir=$withval], - [pkgconfigdir='${libdir}/pkgconfig']) + [ --with-pkgconfigdir=DIR pkgconfig file in DIR @<:@LIBDIR/pkgconfig@:>@], + [pkgconfigdir=$withval], + [pkgconfigdir='${libdir}/pkgconfig']) AC_SUBST(pkgconfigdir) subdirs2="include" @@ -49,6 +51,9 @@ fi if test "$enable_example" != "no"; then subdirs2="$subdirs2 example"; fi +if test "$enable_test" != "no"; then + subdirs2="$subdirs2 test"; +fi if test "$enable_mtab" = "no"; then AC_DEFINE(IGNORE_MTAB, 1, [Don't update /etc/mtab]) fi @@ -120,7 +125,7 @@ if test "$arch" = linux -a "$cross_compiling" != "yes"; then fi fi -AC_CONFIG_FILES([fuse3.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile doc/Makefile]) +AC_CONFIG_FILES([fuse3.pc Makefile lib/Makefile util/Makefile example/Makefile include/Makefile doc/Makefile test/Makefile]) AC_OUTPUT if test "$util_linux_ok" = no; then diff --git a/test/.gitignore b/test/.gitignore index 7b95378..9daeafb 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,2 +1 @@ -!Makefile test diff --git a/test/Makefile b/test/Makefile deleted file mode 100644 index 738dd53..0000000 --- a/test/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -CC=gcc -CFLAGS=-Wall -W - -all: test - -clean: - rm -f *.o test diff --git a/test/Makefile.am b/test/Makefile.am new file mode 100644 index 0000000..55d6950 --- /dev/null +++ b/test/Makefile.am @@ -0,0 +1,2 @@ +bin_PROGRAMS = test +test_SOURCES = test.c -- cgit v1.2.3