diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-25 20:04:35 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-25 20:04:35 +0200 |
| commit | 9c6b7f760a17ef7fc55eac298e8778809ccc868e (patch) | |
| tree | 0b406fb5fc664a78dc838afdc04a2658532f712c | |
| parent | aa8619dbeaef06b056629ce56224fe3b91bc7df0 (diff) | |
| download | samba-9c6b7f760a17ef7fc55eac298e8778809ccc868e.tar.gz samba-9c6b7f760a17ef7fc55eac298e8778809ccc868e.tar.bz2 samba-9c6b7f760a17ef7fc55eac298e8778809ccc868e.zip | |
Use variable for selftest directory.
(This used to be commit 78760606fa71c370ae3c05b077c5146166bdaa7b)
| -rw-r--r-- | source4/Makefile | 3 | ||||
| -rw-r--r-- | source4/selftest/config.mk | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/Makefile b/source4/Makefile index 1889ba2d5e..8a8eef7b4d 100644 --- a/source4/Makefile +++ b/source4/Makefile @@ -290,7 +290,8 @@ data.mk: config.status $(MK_FILES) testcov-html:: include $(pidldir)/config.mk -include $(srcdir)/selftest/config.mk +selftestdir := $(srcdir)/selftest +include $(selftestdir)/config.mk showflags:: @echo ' pwd = '`/bin/pwd` diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk index 2ae49b244b..871c14898f 100644 --- a/source4/selftest/config.mk +++ b/source4/selftest/config.mk @@ -1,6 +1,6 @@ TEST_FORMAT = plain -SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \ +SELFTEST = $(LD_LIBPATH_OVERRIDE) $(PERL) $(selftestdir)/selftest.pl --prefix=${selftest_prefix} \ --builddir=$(builddir) --srcdir=$(srcdir) \ --expected-failures=$(srcdir)/samba4-knownfail \ --format=$(TEST_FORMAT) \ |