aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-11-13 21:40:12 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-11-13 23:19:27 +0100
commit7846bc613d46833aca0aae023e4f97c18dc1f92a (patch)
tree7e67b127bcbea387082104cf74799471c3af851f
parent86afe83d867229b11fd4ec9cb6e29af698cacdef (diff)
downloadsamba-7846bc613d46833aca0aae023e4f97c18dc1f92a.tar.gz
samba-7846bc613d46833aca0aae023e4f97c18dc1f92a.tar.xz
samba-7846bc613d46833aca0aae023e4f97c18dc1f92a.zip
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
-rw-r--r--.gitignore2
-rw-r--r--.testr.conf3
-rw-r--r--source4/.testr.conf3
3 files changed, 4 insertions, 4 deletions
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