diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-01-28 09:35:44 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-01-28 10:07:12 +0100 |
| commit | db7ee3733fbca937612247ad5d821121b4792112 (patch) | |
| tree | 3f7007e95a2d40fad457bada93e9ed2de5d0dfcd /source3 | |
| parent | 11b66ccaa10d260a00a4992ce3f9bb2861af953d (diff) | |
| download | samba-db7ee3733fbca937612247ad5d821121b4792112.tar.gz samba-db7ee3733fbca937612247ad5d821121b4792112.tar.bz2 samba-db7ee3733fbca937612247ad5d821121b4792112.zip | |
s3: try to make 'make selftest' work again
metze
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/Makefile.in | 7 | ||||
| -rw-r--r-- | source3/samba4.mk | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 947fdc9f28..607044fd83 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -2951,12 +2951,15 @@ valgrindtest:: all torture timelimit SELFTEST_FORMAT = plain selftestdir = ../selftest +S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin" + selftest:: all torture timelimit - @$(selftestdir)/selftest.pl --prefix=st --target=samba3 \ + @$(S3_LD_LIBPATH_OVERRIDE) $(selftestdir)/selftest.pl \ + --prefix=${selftest_prefix} --target=samba3 \ --testlist="$(srcdir)/selftest/tests.sh|" \ --expected-failures=$(srcdir)/selftest/knownfail \ --exclude=$(srcdir)/selftest/skip \ - --socket-wrapper $(TESTS) --format=$(SELFTEST_FORMAT) + --socket-wrapper $(TESTS) --format=$(SELFTEST_FORMAT) --immediate selftest-%: $(MAKE) selftest TESTS=$* diff --git a/source3/samba4.mk b/source3/samba4.mk index 49afa3a2e2..715961e4de 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -170,9 +170,9 @@ everything:: $(patsubst %,%4,$(BINARIES)) setup: @ln -sf ../source4/setup setup -LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared" +S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared" -SELFTEST4 = $(LD_LIBPATH_OVERRIDE) EXEEXT="4" $(PERL) $(selftestdir)/selftest.pl --prefix=st4 \ +SELFTEST4 = $(S4_LD_LIBPATH_OVERRIDE) EXEEXT="4" $(PERL) $(selftestdir)/selftest.pl --prefix=st4 \ --builddir=$(builddir) --srcdir=$(samba4srcdir) \ --exeext=4 \ --expected-failures=$(samba4srcdir)/selftest/knownfail \ |