1
0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00

Fix the build, add filtered subunit runner.

This commit is contained in:
Jelmer Vernooij
2010-03-01 16:24:29 +01:00
parent 4e4e341c68
commit 24d52dc362
3 changed files with 6 additions and 1 deletions

1
.gitignore vendored
View File

@ -412,3 +412,4 @@ docs-xml/Samba3-HOWTO/images/idmap-uid2sid.png
docs-xml/Samba3-HOWTO/images/pdftoepsonusb.png docs-xml/Samba3-HOWTO/images/pdftoepsonusb.png
docs-xml/Samba3-HOWTO/images/pdftosocket.png docs-xml/Samba3-HOWTO/images/pdftosocket.png
docs-xml/Samba3-HOWTO/images/trusts1.png docs-xml/Samba3-HOWTO/images/trusts1.png
source4/.testrepository

View File

@ -204,7 +204,7 @@ class Ldb(ldb.Ldb):
try: try:
self.delete(attr) self.delete(attr)
except ldb.LdbError, (errno, _): except ldb.LdbError, (errno, _):
if errno != ldb.ERR_NO_SUCH_OBJECT if errno != ldb.ERR_NO_SUCH_OBJECT:
# Ignore missing dn errors # Ignore missing dn errors
raise raise

View File

@ -23,6 +23,10 @@ test-subunit:: everything
$(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH) $(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH)
$(ST_DONE_TEST) $(ST_DONE_TEST)
test-subunit-filtered:: everything
$(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH) | $(FILTER_XFAIL)
$(ST_DONE_TEST)
slowtest:: everything slowtest:: everything
$(ST_RM) $(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT) $(ST_RM) $(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
$(ST_DONE_TEST) $(ST_DONE_TEST)