From 24d52dc362210328e16545830835361ac82432c4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 1 Mar 2010 16:24:29 +0100
Subject: Fix the build, add filtered subunit runner.

---
 .gitignore                                 | 1 +
 source4/scripting/python/samba/__init__.py | 2 +-
 source4/selftest/config.mk                 | 4 ++++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b40c7941695..7f1a9be0579 100644
--- a/.gitignore
+++ b/.gitignore
@@ -412,3 +412,4 @@ docs-xml/Samba3-HOWTO/images/idmap-uid2sid.png
 docs-xml/Samba3-HOWTO/images/pdftoepsonusb.png
 docs-xml/Samba3-HOWTO/images/pdftosocket.png
 docs-xml/Samba3-HOWTO/images/trusts1.png
+source4/.testrepository
diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py
index c3446146a7a..9cc224b562e 100644
--- a/source4/scripting/python/samba/__init__.py
+++ b/source4/scripting/python/samba/__init__.py
@@ -204,7 +204,7 @@ class Ldb(ldb.Ldb):
             try:
                 self.delete(attr)
             except ldb.LdbError, (errno, _):
-                if errno != ldb.ERR_NO_SUCH_OBJECT
+                if errno != ldb.ERR_NO_SUCH_OBJECT:
                     # Ignore missing dn errors
                     raise
 
diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 9e2896e26d3..04d42d279c9 100644
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -23,6 +23,10 @@ test-subunit:: everything
 	$(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH)
 	$(ST_DONE_TEST)
 
+test-subunit-filtered:: everything
+	$(ST_RM) $(SELFTEST) --socket-wrapper $(TESTS) $(ST_TOUCH) | $(FILTER_XFAIL)
+	$(ST_DONE_TEST)
+
 slowtest:: everything
 	$(ST_RM) $(SELFTEST) $(DEFAULT_TEST_OPTIONS) $(TESTS) $(ST_TOUCH) | $(FORMAT_TEST_OUTPUT)
 	$(ST_DONE_TEST)
-- 
cgit v1.2.1