configure-sampledata: cp lib/bup/*.py, not cmd/*.py

So the tests won't depend on the location of the subcommands, in
preparation for their move to lib/bup/cmd.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/dev/configure-sampledata b/dev/configure-sampledata
index c24a79c01d3dca10e4ee5fe5ea9d1ec67d9f986a..dc24b8986b55b5f943c14a51c862380477061f2d 100755 (executable)
--- a/dev/configure-sampledata
+++ b/dev/configure-sampledata
@@ -45,7 +45,7 @@ case "$1" in
             ln -sf "$(pwd)/abs-symlink-target" abs-symlink || exit $?
             mkfifo fifo
             mkdir -p cmd doc lib/bup || exit $?
-            cp -pP "$top"/cmd/*.py cmd/ || exit $?
+            cp -pP "$top"/lib/bup/*.py lib/bup/ || exit $?
             cp -pP "$top"/Documentation/*.md doc/ || exit $?
             cp -pP "$top"/lib/bup/*.py lib/bup || exit $?
             mkdir path-zoo || exit $?

diff --git a/test/ext/test-meta b/test/ext/test-meta
index 0f8bb6054c8303bf39842bd466786e8fb46e4a07..a20748b207092518c886a3c1dc85355ac08e95ea 100755 (executable)
--- a/test/ext/test-meta
+++ b/test/ext/test-meta
@@ -160,8 +160,8 @@ WVSTART 'metadata save/restore (general)'
     # Test a deeper subdir/ to make sure top-level non-dir metadata is
     # restored correctly.  We need at least one dir and one non-dir at
     # the "top-level".
-    WVPASS test -d src/var/cmd
-    WVPASS test -f src/var/cmd/save-cmd.py
+    WVPASS test -d src/var/lib/bup
+    WVPASS test -f src/var/lib/bup/git.py
     WVPASS rm -rf "$BUP_DIR"
     WVPASS bup init
     WVPASS touch -t 201111111111 src-restore # Make sure the top won't match.