tests: Locate resources and scripts relative to top source dir.

--

Locate every resource and every script used in the tests using a path
relative to the top of the source tree.

This is a purely mechanical change, mostly done using regular
expressions, with a few manual fixups here and there.

Signed-off-by: Justus Winter <justus@g10code.com>

1 files changed, 10 insertions, 4 deletions

diff --git a/tests/openpgp/run-tests.scm b/tests/openpgp/run-tests.scm
index 139f61837..d443d1fb8 100644
--- a/tests/openpgp/run-tests.scm
+++ b/tests/openpgp/run-tests.scm
@@ -17,9 +17,9 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program; if not, see <http://www.gnu.org/licenses/>.
 
-(if (string=? "" (getenv "srcdir"))
+(if (string=? "" (getenv "abs_top_srcdir"))
     (begin
-      (echo "Environment variable 'srcdir' not set.  Please point it to"
+      (echo "Environment variable 'abs_top_srcdir' not set.  Please point it to"
 	    "tests/openpgp.")
       (exit 2)))
 
@@ -27,9 +27,15 @@
 (setenv "objdir" (getcwd) #f)
 
 (let* ((tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*))
-       (setup (make-environment-cache (test::scm #f "setup.scm" "setup.scm")))
+       (setup (make-environment-cache (test::scm
+				       #f
+				       (path-join "tests" "openpgp" "setup.scm")
+				       (in-srcdir "tests" "openpgp" "setup.scm"))))
        (runner (if (and (member "--parallel" *args*)
 			(> (length tests) 1))
 		   run-tests-parallel
 		   run-tests-sequential)))
-  (runner (map (lambda (t) (test::scm setup t t)) tests))))
+  (runner (map (lambda (name)
+		 (test::scm setup
+			    (path-join "tests" "openpgp" name)
+			    (in-srcdir "tests" "openpgp" name))) tests)))