diff options
| author | Martin Pärtel <martin.partel@gmail.com> | 2016-11-17 08:51:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-17 08:51:50 +0000 |
| commit | d78ba82067a164badcf193b11a8dbcbb80468f92 (patch) | |
| tree | 1c7601a9e0768be96dfcf751b29105d3a77a6e05 | |
| parent | 10ac49f8aab2816a3b964db12ab284ad8a9c08a1 (diff) | |
| parent | 37380cba4379897674d0ff8c5115f10691d4474a (diff) | |
| download | bindfs-d78ba82067a164badcf193b11a8dbcbb80468f92.tar.gz | |
Merge pull request #45 from dandedrick/fix-out-of-place-build
tests: fix building out of place
| -rw-r--r-- | tests/internals/Makefile.am | 8 | ||||
| -rwxr-xr-x | tests/internals/test_internals_valgrind.sh | 4 | ||||
| -rwxr-xr-x | tests/internals/test_rate_limiter_valgrind.sh | 4 | ||||
| -rwxr-xr-x | tests/test_bindfs.rb | 7 |
4 files changed, 15 insertions, 8 deletions
diff --git a/tests/internals/Makefile.am b/tests/internals/Makefile.am index 3006399..c35d9be 100644 --- a/tests/internals/Makefile.am +++ b/tests/internals/Makefile.am @@ -1,14 +1,14 @@ noinst_HEADERS = test_common.h noinst_PROGRAMS = test_internals test_rate_limiter -test_internals_SOURCES = test_internals.c test_common.c $(top_builddir)/src/misc.c -test_rate_limiter_SOURCES = test_rate_limiter.c test_common.c $(top_builddir)/src/rate_limiter.c +test_internals_SOURCES = test_internals.c test_common.c $(top_srcdir)/src/misc.c +test_rate_limiter_SOURCES = test_rate_limiter.c test_common.c $(top_srcdir)/src/rate_limiter.c -test_internals_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I. -I$(top_builddir)/src +test_internals_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I. -I$(top_srcdir)/src test_internals_CFLAGS = ${my_CFLAGS} test_internals_LDADD = ${my_LDFLAGS} -test_rate_limiter_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I. -I$(top_builddir)/src +test_rate_limiter_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I. -I$(top_srcdir)/src test_rate_limiter_CFLAGS = ${my_CFLAGS} test_rate_limiter_LDADD = ${my_LDFLAGS} diff --git a/tests/internals/test_internals_valgrind.sh b/tests/internals/test_internals_valgrind.sh index a84c664..4511ccd 100755 --- a/tests/internals/test_internals_valgrind.sh +++ b/tests/internals/test_internals_valgrind.sh @@ -1,3 +1,5 @@ #!/bin/sh -cd `dirname "$0"` +if [ ! -x ./test_internals ]; then + cd `dirname "$0"` +fi valgrind --error-exitcode=100 ./test_internals diff --git a/tests/internals/test_rate_limiter_valgrind.sh b/tests/internals/test_rate_limiter_valgrind.sh index e291360..bf0a7cd 100755 --- a/tests/internals/test_rate_limiter_valgrind.sh +++ b/tests/internals/test_rate_limiter_valgrind.sh @@ -1,3 +1,5 @@ #!/bin/sh -cd `dirname "$0"` +if [ ! -x ./test_rate_limiter ]; then + cd `dirname "$0"` +fi valgrind --error-exitcode=100 ./test_rate_limiter diff --git a/tests/test_bindfs.rb b/tests/test_bindfs.rb index 48611b2..39f709e 100755 --- a/tests/test_bindfs.rb +++ b/tests/test_bindfs.rb @@ -18,7 +18,10 @@ # along with bindfs. If not, see <http://www.gnu.org/licenses/>. # -require './common.rb' +# if we are being run by make check it will set srcdir and we should use it +localsrc_path = ENV['srcdir'] || '.' + +require localsrc_path + '/common.rb' include Errno @@ -39,7 +42,7 @@ $nobody_uid = nobody_uid = Etc.getpwnam('nobody').uid $nobody_gid = nobody_gid = Etc.getpwnam('nobody').gid $nobody_group = nobody_group = Etc.getgrgid(nobody_gid).name -$tests_dir = File.dirname(File.realpath(__FILE__)) +$tests_dir = File.realpath('.') testenv("") do |