From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 13 Nov 2011 20:40:12 +0000 (+0100)
Subject: Move testr configuration to root.
X-Git-Tag: ldb-1.1.4~341
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=7846bc613d46833aca0aae023e4f97c18dc1f92a

Move testr configuration to root.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Nov 13 23:19:27 CET 2011 on sn-devel-104
---

diff --git a/.gitignore b/.gitignore
index d6d3e818d1e..e21ea90d7da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,4 +137,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
+.testrepository
diff --git a/.testr.conf b/.testr.conf
new file mode 100644
index 00000000000..e58becdafbd
--- /dev/null
+++ b/.testr.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+test_command=./buildtools/bin/waf test --filtered-subunit $IDOPTION
+test_id_option=--load-list $IDFILE
diff --git a/source4/.testr.conf b/source4/.testr.conf
deleted file mode 100644
index d3670bec10f..00000000000
--- a/source4/.testr.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[DEFAULT]
-test_command=../buildtools/bin/waf test --filtered-subunit $IDOPTION
-test_id_option=--load-list $IDFILE