diff options
| author | Justus Winter <[email protected]> | 2017-03-22 11:40:42 +0000 |
|---|---|---|
| committer | Justus Winter <[email protected]> | 2017-04-24 12:14:05 +0000 |
| commit | ed4d23d75e8ba89e998b88a4f862661c81f665a3 (patch) | |
| tree | 7e956da634802ab2d802f5e5d9e208932d606926 /tests/gpgme/run-tests.scm | |
| parent | gpgscm: Move 'trace' and 'stringify'. (diff) | |
| download | gnupg-ed4d23d75e8ba89e998b88a4f862661c81f665a3.tar.gz gnupg-ed4d23d75e8ba89e998b88a4f862661c81f665a3.zip | |
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 <[email protected]>
Diffstat (limited to 'tests/gpgme/run-tests.scm')
| -rw-r--r-- | tests/gpgme/run-tests.scm | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/tests/gpgme/run-tests.scm b/tests/gpgme/run-tests.scm index be70f178d..df5f5482b 100644 --- a/tests/gpgme/run-tests.scm +++ b/tests/gpgme/run-tests.scm @@ -17,7 +17,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with this program; if not, see <http://www.gnu.org/licenses/>. -(load (with-path "gpgme-defs.scm")) +(load (in-srcdir "tests" "gpgme" "gpgme-defs.scm")) (info "Running GPGME's test suite...") @@ -40,11 +40,17 @@ run-tests-parallel run-tests-sequential)) (setup-c (make-environment-cache - (test::scm #f "setup.scm (tests/gpg)" (in-srcdir "setup.scm") - "--" "tests" "gpg"))) + (test::scm + #f + (path-join "tests" "gpgme" "setup.scm" "tests" "gpg") + (in-srcdir "tests" "gpgme" "setup.scm") + "--" "tests" "gpg"))) (setup-py (make-environment-cache - (test::scm #f "setup.scm (lang/python/tests)" (in-srcdir "setup.scm") - "--" "lang" "python" "tests"))) + (test::scm + #f + (path-join "tests" "gpgme" "setup.scm" "lang" "python" "tests") + (in-srcdir "tests" "gpgme" "setup.scm") + "--" "lang" "python" "tests"))) (tests (filter (lambda (arg) (not (string-prefix? arg "--"))) *args*))) (runner (apply @@ -66,7 +72,10 @@ (map (lambda (name) (apply test::scm `(,(:setup cmpnts) - ,name ,(in-srcdir "wrap.scm") --executable + ,(apply path-join + `("tests" "gpgme" ,@(:path cmpnts) ,name)) + ,(in-srcdir "tests" "gpgme" "wrap.scm") + --executable ,(find-test name) -- ,@(:path cmpnts)))) (if (null? tests) (all-tests makefile (:key cmpnts)) tests)))) |