Commitd78ba82

authored

Merge pull requestmpartel#45 from dandedrick/fix-out-of-place-build

tests: fix building out of place

2 parents10ac49f +37380cb commitd78ba82Copy full SHA for d78ba82

File tree

+15

-8

lines changed

+15

-8

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,14 @@`
`1`	`1`
`2`	`2`	`noinst_HEADERS = test_common.h`
`3`	`3`	`noinst_PROGRAMS = test_internals test_rate_limiter`
`4`		`-test_internals_SOURCES = test_internals.c test_common.c$(top_builddir)/src/misc.c`
`5`		`-test_rate_limiter_SOURCES = test_rate_limiter.c test_common.c$(top_builddir)/src/rate_limiter.c`
	`4`	`+test_internals_SOURCES = test_internals.c test_common.c$(top_srcdir)/src/misc.c`
	`5`	`+test_rate_limiter_SOURCES = test_rate_limiter.c test_common.c$(top_srcdir)/src/rate_limiter.c`
`6`	`6`
`7`		`-test_internals_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I. -I$(top_builddir)/src`
	`7`	`+test_internals_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I. -I$(top_srcdir)/src`
`8`	`8`	`test_internals_CFLAGS = ${my_CFLAGS}`
`9`	`9`	`test_internals_LDADD = ${my_LDFLAGS}`
`10`	`10`
`11`		`-test_rate_limiter_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I. -I$(top_builddir)/src`
	`11`	`+test_rate_limiter_CPPFLAGS = ${my_CPPFLAGS} ${fuse_CFLAGS} -I. -I$(top_srcdir)/src`
`12`	`12`	`test_rate_limiter_CFLAGS = ${my_CFLAGS}`
`13`	`13`	`test_rate_limiter_LDADD = ${my_LDFLAGS}`
`14`	`14`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
`1`	`1`	`#!/bin/sh`
`2`		-cd`dirname"$0"`
	`2`	`+if [!-x ./test_internals ];then`
	`3`	+cd`dirname"$0"`
	`4`	`+fi`
`3`	`5`	`valgrind --error-exitcode=100 ./test_internals`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
`1`	`1`	`#!/bin/sh`
`2`		-cd`dirname"$0"`
	`2`	`+if [!-x ./test_rate_limiter ];then`
	`3`	+cd`dirname"$0"`
	`4`	`+fi`
`3`	`5`	`valgrind --error-exitcode=100 ./test_rate_limiter`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,10 @@`
`18`	`18`	`# along with bindfs. If not, see <http://www.gnu.org/licenses/>.`
`19`	`19`	`#`
`20`	`20`
`21`		`-require'./common.rb'`
	`21`	`+# if we are being run by make check it will set srcdir and we should use it`
	`22`	`+localsrc_path=ENV['srcdir'] \|\|'.'`
	`23`	`+`
	`24`	`+requirelocalsrc_path +'/common.rb'`
`22`	`25`
`23`	`26`	`includeErrno`
`24`	`27`
`@@ -39,7 +42,7 @@ def chown(user, group, list)`
`39`	`42`	`$nobody_gid=nobody_gid=Etc.getpwnam('nobody').gid`
`40`	`43`	`$nobody_group=nobody_group=Etc.getgrgid(nobody_gid).name`
`41`	`44`
`42`		`-$tests_dir=File.dirname(File.realpath(__FILE__))`
	`45`	`+$tests_dir=File.realpath('.')`
`43`	`46`
`44`	`47`
`45`	`48`	`testenv("")do`

Comments

(0)