Put testtools directly under lib/ to make it easier to install from Samba 4.

23 files changed, 19 insertions, 17 deletions

diff --git a/lib/subunit/update.sh b/lib/subunit/update.sh
deleted file mode 100755
index 1b27ba634c3..00000000000
--- a/lib/subunit/update.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# Pull in a new snapshot of Subunit from the upstream bzr branch
-
-TARGETDIR="`dirname $0`"
-WORKDIR="`mktemp -d`"
-
-bzr export "$WORKDIR/subunit" lp:subunit 
-bzr export "$WORKDIR/testtools" lp:testtools 
-
-for p in python/ filters/ perl/
-do
-	rsync -avz --delete "$WORKDIR/subunit/$p" "$TARGETDIR/$p"
-done
-
-rsync -avz --delete "$WORKDIR/testtools/testtools/" "$TARGETDIR/python/testtools/"
-
-rm -rf "$WORKDIR"
diff --git a/lib/subunit/python/testtools/__init__.py b/lib/testtools/__init__.py
index 0504d661d48..0504d661d48 100644
--- a/lib/subunit/python/testtools/__init__.py
+++ b/lib/testtools/__init__.py
diff --git a/lib/subunit/python/testtools/content.py b/lib/testtools/content.py
index 353e3f0f464..353e3f0f464 100644
--- a/lib/subunit/python/testtools/content.py
+++ b/lib/testtools/content.py
diff --git a/lib/subunit/python/testtools/content_type.py b/lib/testtools/content_type.py
index aded81b7322..aded81b7322 100644
--- a/lib/subunit/python/testtools/content_type.py
+++ b/lib/testtools/content_type.py
diff --git a/lib/subunit/python/testtools/matchers.py b/lib/testtools/matchers.py
index 039c84b7c7e..039c84b7c7e 100644
--- a/lib/subunit/python/testtools/matchers.py
+++ b/lib/testtools/matchers.py
diff --git a/lib/subunit/python/testtools/run.py b/lib/testtools/run.py
index c4f461ecfb8..c4f461ecfb8 100755
--- a/lib/subunit/python/testtools/run.py
+++ b/lib/testtools/run.py
diff --git a/lib/subunit/python/testtools/runtest.py b/lib/testtools/runtest.py
index 053e2205a75..053e2205a75 100644
--- a/lib/subunit/python/testtools/runtest.py
+++ b/lib/testtools/runtest.py
diff --git a/lib/subunit/python/testtools/testcase.py b/lib/testtools/testcase.py
index fd70141e6d4..fd70141e6d4 100644
--- a/lib/subunit/python/testtools/testcase.py
+++ b/lib/testtools/testcase.py
diff --git a/lib/subunit/python/testtools/testresult/__init__.py b/lib/testtools/testresult/__init__.py
index 2ee3d252939..2ee3d252939 100644
--- a/lib/subunit/python/testtools/testresult/__init__.py
+++ b/lib/testtools/testresult/__init__.py
diff --git a/lib/subunit/python/testtools/testresult/doubles.py b/lib/testtools/testresult/doubles.py
index d231c919c24..d231c919c24 100644
--- a/lib/subunit/python/testtools/testresult/doubles.py
+++ b/lib/testtools/testresult/doubles.py
diff --git a/lib/subunit/python/testtools/testresult/real.py b/lib/testtools/testresult/real.py
index 8c8a3edd6ec..8c8a3edd6ec 100644
--- a/lib/subunit/python/testtools/testresult/real.py
+++ b/lib/testtools/testresult/real.py
diff --git a/lib/subunit/python/testtools/tests/__init__.py b/lib/testtools/tests/__init__.py
index 2cceba91e29..2cceba91e29 100644
--- a/lib/subunit/python/testtools/tests/__init__.py
+++ b/lib/testtools/tests/__init__.py
diff --git a/lib/subunit/python/testtools/tests/helpers.py b/lib/testtools/tests/helpers.py
index c4cf10c7365..c4cf10c7365 100644
--- a/lib/subunit/python/testtools/tests/helpers.py
+++ b/lib/testtools/tests/helpers.py
diff --git a/lib/subunit/python/testtools/tests/test_content.py b/lib/testtools/tests/test_content.py
index 11593620364..11593620364 100644
--- a/lib/subunit/python/testtools/tests/test_content.py
+++ b/lib/testtools/tests/test_content.py
diff --git a/lib/subunit/python/testtools/tests/test_content_type.py b/lib/testtools/tests/test_content_type.py
index dbefc21decf..dbefc21decf 100644
--- a/lib/subunit/python/testtools/tests/test_content_type.py
+++ b/lib/testtools/tests/test_content_type.py
diff --git a/lib/subunit/python/testtools/tests/test_matchers.py b/lib/testtools/tests/test_matchers.py
index 74b1ebc56ac..74b1ebc56ac 100644
--- a/lib/subunit/python/testtools/tests/test_matchers.py
+++ b/lib/testtools/tests/test_matchers.py
diff --git a/lib/subunit/python/testtools/tests/test_runtest.py b/lib/testtools/tests/test_runtest.py
index 5c46ad17843..5c46ad17843 100644
--- a/lib/subunit/python/testtools/tests/test_runtest.py
+++ b/lib/testtools/tests/test_runtest.py
diff --git a/lib/subunit/python/testtools/tests/test_testresult.py b/lib/testtools/tests/test_testresult.py
index df15b91244e..df15b91244e 100644
--- a/lib/subunit/python/testtools/tests/test_testresult.py
+++ b/lib/testtools/tests/test_testresult.py
diff --git a/lib/subunit/python/testtools/tests/test_testsuite.py b/lib/testtools/tests/test_testsuite.py
index 3f2f02758f4..3f2f02758f4 100644
--- a/lib/subunit/python/testtools/tests/test_testsuite.py
+++ b/lib/testtools/tests/test_testsuite.py
diff --git a/lib/subunit/python/testtools/tests/test_testtools.py b/lib/testtools/tests/test_testtools.py
index af1fd794c36..af1fd794c36 100644
--- a/lib/subunit/python/testtools/tests/test_testtools.py
+++ b/lib/testtools/tests/test_testtools.py
diff --git a/lib/subunit/python/testtools/testsuite.py b/lib/testtools/testsuite.py
index 26b193799b0..26b193799b0 100644
--- a/lib/subunit/python/testtools/testsuite.py
+++ b/lib/testtools/testsuite.py
diff --git a/lib/subunit/python/testtools/utils.py b/lib/testtools/utils.py
index c0845b610c6..c0845b610c6 100644
--- a/lib/subunit/python/testtools/utils.py
+++ b/lib/testtools/utils.py
diff --git a/lib/update-external.sh b/lib/update-external.sh
new file mode 100755
index 00000000000..7cf95f3fb8c
--- /dev/null
+++ b/lib/update-external.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+# Pull in a new snapshot of external projects that are included in 
+# our source tree for users that don't have them installed on their system
+
+TARGETDIR="`dirname $0`"
+WORKDIR="`mktemp -d`"
+
+echo "Updating subunit..."
+bzr export "$WORKDIR/subunit" lp:subunit 
+for p in python/ filters/ perl/
+do
+	rsync -avz --delete "$WORKDIR/subunit/$p" "$TARGETDIR/subunit/$p"
+done
+
+echo "Updating testtools..."
+bzr export "$WORKDIR/testtools" lp:testtools 
+rsync -avz --delete "$WORKDIR/testtools/testtools/" "$TARGETDIR/testtools/"
+
+rm -rf "$WORKDIR"