jenkins: really fix running tests on windows
authorJustus Winter <justus@g10code.com>
Tue, 18 Jul 2017 14:13:53 +0000 (16:13 +0200)
committerJustus Winter <justus@g10code.com>
Tue, 18 Jul 2017 14:13:53 +0000 (16:13 +0200)
misc/jenkins/bin/run-tests.bat

index 9b0527a..99cfc53 100644 (file)
@@ -1,6 +1,7 @@
 @echo off
 
 set BIN_PREFIX=d:\gnupg
+set abs_top_srcdir=%BIN_PREFIX%
 set PATH=%BIN_PREFIX%;%PATH%
 set GPGSCM_PATH=%BIN_PREFIX%/tests/gpgscm;%BIN_PREFIX%/tests/openpgp
 set EXEEXT=.exe
@@ -21,8 +22,7 @@ cd /d %WD%
 mkdir openpgp
 cd openpgp
 
-set abs_top_srcdir=%BIN_PREFIX%/tests/openpgp
-%BIN_PREFIX%\gpgscm.exe %srcdir%/run-tests.scm --parallel version.scm enarmor.scm mds.scm decrypt.scm decrypt-multifile.scm decrypt-dsa.scm decrypt-session-key.scm sigs.scm sigs-dsa.scm encrypt.scm encrypt-multifile.scm encrypt-dsa.scm compression.scm seat.scm clearsig.scm encryptp.scm detach.scm detachm.scm armsigs.scm armencrypt.scm armencryptp.scm signencrypt.scm signencrypt-dsa.scm armsignencrypt.scm armdetach.scm armdetachm.scm genkey1024.scm conventional.scm conventional-mdc.scm multisig.scm verify.scm verify-multifile.scm gpgv-forged-keyring.scm armor.scm import.scm import-revocation-certificate.scm ecc.scm 4gb-packet.scm tofu.scm use-exact-key.scm default-key.scm export.scm ssh-import.scm ssh-export.scm quick-key-manipulation.scm key-selection.scm delete-keys.scm gpgconf.scm issue2015.scm issue2346.scm issue2417.scm issue2419.scm issue2929.scm
+%BIN_PREFIX%\gpgscm.exe %abs_top_srcdir%/tests/openpgp/run-tests.scm --parallel version.scm enarmor.scm mds.scm decrypt.scm decrypt-multifile.scm decrypt-dsa.scm decrypt-session-key.scm sigs.scm sigs-dsa.scm encrypt.scm encrypt-multifile.scm encrypt-dsa.scm compression.scm seat.scm clearsig.scm encryptp.scm detach.scm detachm.scm armsigs.scm armencrypt.scm armencryptp.scm signencrypt.scm signencrypt-dsa.scm armsignencrypt.scm armdetach.scm armdetachm.scm genkey1024.scm conventional.scm conventional-mdc.scm multisig.scm verify.scm verify-multifile.scm gpgv-forged-keyring.scm armor.scm import.scm import-revocation-certificate.scm ecc.scm 4gb-packet.scm tofu.scm use-exact-key.scm default-key.scm export.scm ssh-import.scm ssh-export.scm quick-key-manipulation.scm key-selection.scm delete-keys.scm gpgconf.scm issue2015.scm issue2346.scm issue2417.scm issue2419.scm issue2929.scm
 
 echo Running gpgsm tests...
 cd /d %WD%
@@ -30,8 +30,7 @@ mkdir gpgsm
 cd gpgsm
 
 set GPGSCM_PATH=%BIN_PREFIX%/tests/gpgscm;%BIN_PREFIX%/tests/openpgp;%BIN_PREFIX%/tests/gpgsm
-set abs_top_srcdir=%BIN_PREFIX%/tests/gpgsm
-%BIN_PREFIX%\gpgscm.exe %srcdir%/run-tests.scm --parallel import.scm encrypt.scm verify.scm decrypt.scm sign.scm export.scm
+%BIN_PREFIX%\gpgscm.exe %abs_top_srcdir%/tests/gpgsm/run-tests.scm --parallel import.scm encrypt.scm verify.scm decrypt.scm sign.scm export.scm
 
 echo Running GPGME tests...
 cd /d %WD%
@@ -40,7 +39,6 @@ cd gpgme
 
 rem set verbose=3
 set GPGSCM_PATH=%BIN_PREFIX%/tests/gpgscm;%BIN_PREFIX%/tests/openpgp;%BIN_PREFIX%/tests/gpgme
-set abs_top_srcdir=%BIN_PREFIX%/tests/gpgme
 set XTEST_GPGME_SRCDIR=%BIN_PREFIX%/gpgme
 set XTEST_GPGME_BUILDDIR=%BIN_PREFIX%/gpgme/obj.w32
-%BIN_PREFIX%\gpgscm.exe %srcdir%/run-tests.scm --parallel
+%BIN_PREFIX%\gpgscm.exe %abs_top_srcdir%/tests/gpgme/run-tests.scm --parallel