diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-16 20:05:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:21:13 -0500 |
| commit | 52e3f69a36b6ba6a589a8f768fbee77ee06b281c (patch) | |
| tree | 4f77d34f1c12b2fb77f672ed2d989f7ad88d7ca6 /source4/main.mk | |
| parent | 3478bf1c238eaa82d9383f18dcb7d802aed06cd0 (diff) | |
| download | samba-52e3f69a36b6ba6a589a8f768fbee77ee06b281c.tar.gz samba-52e3f69a36b6ba6a589a8f768fbee77ee06b281c.tar.bz2 samba-52e3f69a36b6ba6a589a8f768fbee77ee06b281c.zip | |
r19343: Add support for external scripts/binaries that write results using the
'subunit' protocol. This allows us to easily plug EJS scripts or binaries that
can't depend on -ltorture into smbtorture. The protocol is very simple:
- write "comments" to stderr
Example output on stdout:
test: foo
success: foo
test: bar
success: bar
test: blah
failure: blah [
dummy.c:30: Expression 1 != 2 failed!
]
test: blie
skip: blie [
Iconv support not built in
]
I've already converted the talloc testsuite.
(This used to be commit e1742c14a247fabba969f8698108e73997d3f420)
Diffstat (limited to 'source4/main.mk')
| -rw-r--r-- | source4/main.mk | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/source4/main.mk b/source4/main.mk index 7151ebb70b..42c471da80 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -61,6 +61,7 @@ showlayout: @echo ' jsdir: $(JSDIR)' @echo ' swatdir: $(SWATDIR)' @echo ' mandir: $(MANDIR)' + @echo ' torturedir: $(TORTUREDIR)' @echo ' datadir: $(DATADIR)' @echo ' winbindd_socket_dir: $(WINBINDD_SOCKET_DIR)' @@ -105,6 +106,7 @@ installdirs: $(DESTDIR)$(BASEDIR) \ $(DESTDIR)$(BINDIR) \ $(DESTDIR)$(SBINDIR) \ + $(DESTDIR)$(TORTUREDIR) \ $(DESTDIR)$(LIBDIR) \ $(DESTDIR)$(MODULESDIR) \ $(DESTDIR)$(MANDIR) \ @@ -134,6 +136,13 @@ installbin: $(SBIN_PROGS) $(BIN_PROGS) installdirs $(DESTDIR)$(LIBDIR) \ $(DESTDIR)$(VARDIR) \ $(BIN_PROGS) + @$(SHELL) $(srcdir)/script/installbin.sh \ + $(INSTALLPERMS) \ + $(DESTDIR)$(BASEDIR) \ + $(DESTDIR)$(TORTUREDIR) \ + $(DESTDIR)$(LIBDIR) \ + $(DESTDIR)$(VARDIR) \ + $(TORTURE_PROGS) installlib: $(INSTALLABLE_SHARED_LIBS) $(STATIC_LIBS) installdirs @$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) "$(SHLIBEXT)" $(INSTALLABLE_SHARED_LIBS) @@ -166,6 +175,7 @@ uninstallmisc: uninstallbin: @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(SBINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(SBIN_PROGS) @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(BIN_PROGS) + @$(SHELL) $(srcdir)/script/uninstallbin.sh $(INSTALLPERMS) $(DESTDIR)$(BASEDIR) $(DESTDIR)$(TORTUREDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(VARDIR) $(DESTDIR)$(TORTURE_PROGS) uninstalllib: @$(SHELL) $(srcdir)/script/uninstalllib.sh $(DESTDIR)$(LIBDIR) $(SHARED_LIBS) @@ -242,7 +252,7 @@ clean:: clean_pch @echo Removing hostcc objects @-find . -name '*.ho' -exec rm -f '{}' \; @echo Removing binaries - @-rm -f $(BIN_PROGS) $(SBIN_PROGS) $(BINARIES) + @-rm -f $(BIN_PROGS) $(SBIN_PROGS) $(BINARIES) $(TORTURE_PROGS) @echo Removing libraries @-rm -f $(STATIC_LIBRARIES) $(SHARED_LIBRARIES) @-rm -f bin/*.$(SHLIBEXT)* |