test/local/ -> test/

24 files changed, 6 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index a6576e5..fe20548 100644
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,8 @@ DO:
 all: test
 
 .PHONY: test
-test: test/local
-
-.PHONY: test/local
-test/local:
-	./test/local/main.sh
+test:
+	./test/main.sh
 
 test/docker/%: DO
 	cd test/docker && \
diff --git a/test/local/data/dest/1.txt b/test/data/dest/1.txt
index 3a2e3f4..3a2e3f4 100644
--- a/test/local/data/dest/1.txt
+++ b/test/data/dest/1.txt
diff --git a/test/local/data/dest/bar/3.txt b/test/data/dest/bar/3.txt
index a83d1d5..a83d1d5 100644
--- a/test/local/data/dest/bar/3.txt
+++ b/test/data/dest/bar/3.txt
diff --git a/test/local/data/src/%DEST%/1.txt b/test/data/src/%DEST%/1.txt
index d00491f..d00491f 100644
--- a/test/local/data/src/%DEST%/1.txt
+++ b/test/data/src/%DEST%/1.txt
diff --git a/test/local/data/src/%DEST%/bar/3.txt b/test/data/src/%DEST%/bar/3.txt
index 00750ed..00750ed 100644
--- a/test/local/data/src/%DEST%/bar/3.txt
+++ b/test/data/src/%DEST%/bar/3.txt
diff --git a/test/local/data/src/%DEST%/bar/baz/4.txt b/test/data/src/%DEST%/bar/baz/4.txt
index b8626c4..b8626c4 100644
--- a/test/local/data/src/%DEST%/bar/baz/4.txt
+++ b/test/data/src/%DEST%/bar/baz/4.txt
diff --git a/test/local/data/src/%DEST%/foo/2.txt b/test/data/src/%DEST%/foo/2.txt
index 0cfbf08..0cfbf08 100644
--- a/test/local/data/src/%DEST%/foo/2.txt
+++ b/test/data/src/%DEST%/foo/2.txt
diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile
index f1d4dbc..8cbae4f 100644
--- a/test/docker/Dockerfile
+++ b/test/docker/Dockerfile
@@ -12,4 +12,4 @@ COPY [".", "/src"]
 
 WORKDIR /src
 
-CMD ["make", "test/local"]
+CMD ["make", "test"]
diff --git a/test/local/lib/log.sh b/test/lib/log.sh
index b26e16a..b26e16a 100644
--- a/test/local/lib/log.sh
+++ b/test/lib/log.sh
diff --git a/test/local/lib/test.sh b/test/lib/test.sh
index 43cf55b..1406a78 100644
--- a/test/local/lib/test.sh
+++ b/test/lib/test.sh
@@ -66,15 +66,15 @@ test_run_script() {
 }
 
 test_run_update() {
-    test_run_script "$script_dir/../../bin/links-update" "$@"
+    test_run_script "$script_dir/../bin/links-update" "$@"
 }
 
 test_run_remove() {
-    test_run_script "$script_dir/../../bin/links-remove"
+    test_run_script "$script_dir/../bin/links-remove"
 }
 
 test_run_chmod() {
-    test_run_script "$script_dir/../../bin/links-chmod" "$@"
+    test_run_script "$script_dir/../bin/links-chmod" "$@"
 }
 
 test_verify_output() {
diff --git a/test/local/main.sh b/test/main.sh
index 52b19ad..52b19ad 100755
--- a/test/local/main.sh
+++ b/test/main.sh
diff --git a/test/local/tst-chmod.sh b/test/tst-chmod.sh
index b118e5e..b118e5e 100644
--- a/test/local/tst-chmod.sh
+++ b/test/tst-chmod.sh
diff --git a/test/local/tst-dir-symlink-delete.sh b/test/tst-dir-symlink-delete.sh
index f53d87c..f53d87c 100644
--- a/test/local/tst-dir-symlink-delete.sh
+++ b/test/tst-dir-symlink-delete.sh
diff --git a/test/local/tst-dir-symlink-remove-shared-file.sh b/test/tst-dir-symlink-remove-shared-file.sh
index 3e20ab0..3e20ab0 100644
--- a/test/local/tst-dir-symlink-remove-shared-file.sh
+++ b/test/tst-dir-symlink-remove-shared-file.sh
diff --git a/test/local/tst-linux-home.sh b/test/tst-linux-home.sh
index 4d099ee..4d099ee 100644
--- a/test/local/tst-linux-home.sh
+++ b/test/tst-linux-home.sh
diff --git a/test/local/tst-remove-dir-symlink.sh b/test/tst-remove-dir-symlink.sh
index c524ee6..c524ee6 100644
--- a/test/local/tst-remove-dir-symlink.sh
+++ b/test/tst-remove-dir-symlink.sh
diff --git a/test/local/tst-remove-does-not-delete-user-dirs.sh b/test/tst-remove-does-not-delete-user-dirs.sh
index aa013c8..aa013c8 100644
--- a/test/local/tst-remove-does-not-delete-user-dirs.sh
+++ b/test/tst-remove-does-not-delete-user-dirs.sh
diff --git a/test/local/tst-remove-does-not-overwrite-files.sh b/test/tst-remove-does-not-overwrite-files.sh
index baef2ef..baef2ef 100644
--- a/test/local/tst-remove-does-not-overwrite-files.sh
+++ b/test/tst-remove-does-not-overwrite-files.sh
diff --git a/test/local/tst-remove-symlink.sh b/test/tst-remove-symlink.sh
index aa27435..aa27435 100644
--- a/test/local/tst-remove-symlink.sh
+++ b/test/tst-remove-symlink.sh
diff --git a/test/local/tst-remove.sh b/test/tst-remove.sh
index c79a3b4..c79a3b4 100644
--- a/test/local/tst-remove.sh
+++ b/test/tst-remove.sh
diff --git a/test/local/tst-update-chmod.sh b/test/tst-update-chmod.sh
index a78ee15..a78ee15 100644
--- a/test/local/tst-update-chmod.sh
+++ b/test/tst-update-chmod.sh
diff --git a/test/local/tst-update-dir-symlink.sh b/test/tst-update-dir-symlink.sh
index 27418ab..27418ab 100644
--- a/test/local/tst-update-dir-symlink.sh
+++ b/test/tst-update-dir-symlink.sh
diff --git a/test/local/tst-update-symlink.sh b/test/tst-update-symlink.sh
index 6a90491..6a90491 100644
--- a/test/local/tst-update-symlink.sh
+++ b/test/tst-update-symlink.sh
diff --git a/test/local/tst-update.sh b/test/tst-update.sh
index f33b929..f33b929 100644
--- a/test/local/tst-update.sh
+++ b/test/tst-update.sh