From 7dd6f3147c28db0f3f981b108bc979f7b9870f46 Mon Sep 17 00:00:00 2001 From: Samuel Tardieu Date: Sat, 12 Nov 2016 11:30:04 +0100 Subject: [PATCH] Add tests for issue #9 --- .travis.yml | 2 +- Makefile.am | 2 +- configure.ac | 2 +- tests/Makefile.am | 6 ++++++ tests/chdir-not-ok.test | 9 +++++++++ tests/chdir-ok.test | 10 ++++++++++ 6 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 tests/Makefile.am create mode 100755 tests/chdir-not-ok.test create mode 100755 tests/chdir-ok.test diff --git a/.travis.yml b/.travis.yml index d41a8fd..2f35f95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,4 @@ env: - CFLAGS=-O2 CXXFLAGS=-O2 - CFLAGS="-O2 -pedantic -Wall -Wextra -Werror" CXXFLAGS="-O2 -pedantic -Wall -Wextra -Werror" - CFLAGS=-O3 CXXFLAGS=-O3 -script: autoreconf -f -i && ./configure && make +script: autoreconf -f -i && ./configure && make check diff --git a/Makefile.am b/Makefile.am index 3f6bd7f..745c12e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = src doc scripts +SUBDIRS = src doc scripts tests extra_DIST = ChangeLog diff --git a/configure.ac b/configure.ac index f035239..c0484fd 100644 --- a/configure.ac +++ b/configure.ac @@ -4,5 +4,5 @@ AM_INIT_AUTOMAKE AC_CONFIG_HEADER([config.h]) AC_PROG_CC AC_PROG_CXX -AC_CONFIG_FILES([Makefile src/Makefile scripts/Makefile doc/Makefile]) +AC_CONFIG_FILES([Makefile src/Makefile scripts/Makefile doc/Makefile tests/Makefile]) AC_OUTPUT diff --git a/tests/Makefile.am b/tests/Makefile.am new file mode 100644 index 0000000..77e0910 --- /dev/null +++ b/tests/Makefile.am @@ -0,0 +1,6 @@ +TESTS = chdir-ok.test chdir-not-ok.test +XFAIL_TESTS = chdir-not-ok.test + +EXTRA_DIST = *.test + +never:: diff --git a/tests/chdir-not-ok.test b/tests/chdir-not-ok.test new file mode 100755 index 0000000..0a4a042 --- /dev/null +++ b/tests/chdir-not-ok.test @@ -0,0 +1,9 @@ +#! /bin/sh +# + +RECOVERJPEG="$PWD/../src/recoverjpeg" +trap "rm -rf $PWD/$0.dir" INT QUIT TERM EXIT +mkdir "$0.dir" +cd "$0.dir" + +${RECOVERJPEG} -o foo ${RECOVERJPEG} diff --git a/tests/chdir-ok.test b/tests/chdir-ok.test new file mode 100755 index 0000000..535b64c --- /dev/null +++ b/tests/chdir-ok.test @@ -0,0 +1,10 @@ +#! /bin/sh +# + +RECOVERJPEG="$PWD/../src/recoverjpeg" +trap "rm -rf $PWD/$0.dir" INT QUIT TERM EXIT +mkdir "$0.dir" +cd "$0.dir" + +mkdir -p foo/bar +${RECOVERJPEG} -o foo -o bar ${RECOVERJPEG}