diff options
| author | Justus Winter <justus@g10code.com> | 2017-03-22 12:40:42 +0100 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2017-04-24 14:14:05 +0200 |
| commit | ed4d23d75e8ba89e998b88a4f862661c81f665a3 (patch) | |
| tree | 7e956da634802ab2d802f5e5d9e208932d606926 /tests/gpgsm/gpgsm-defs.scm | |
| parent | gpgscm: Move 'trace' and 'stringify'. (diff) | |
| download | gnupg2-ed4d23d75e8ba89e998b88a4f862661c81f665a3.tar.xz gnupg2-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 <justus@g10code.com>
Diffstat (limited to 'tests/gpgsm/gpgsm-defs.scm')
| -rw-r--r-- | tests/gpgsm/gpgsm-defs.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/gpgsm/gpgsm-defs.scm b/tests/gpgsm/gpgsm-defs.scm index 5f9be7f0f..c978c32b3 100644 --- a/tests/gpgsm/gpgsm-defs.scm +++ b/tests/gpgsm/gpgsm-defs.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 "defs.scm")) +(load (in-srcdir "tests" "openpgp" "defs.scm")) ;; This is the list of certificates that we install in the test ;; environment. @@ -83,13 +83,13 @@ (log "Storing private keys") (for-each (lambda (name) - (file-copy (in-srcdir name) + (file-copy (in-srcdir "tests" "gpgsm" name) (path-join "private-keys-v1.d" (string-append name ".key")))) '("32100C27173EF6E9C4E9A25D3D69F86D37A4F939")) (log "Importing public demo and test keys") - (call-check `(,@gpgsm --import ,(in-srcdir "cert_g10code_test1.der"))) + (call-check `(,@gpgsm --import ,(in-srcdir "tests" "gpgsm" "cert_g10code_test1.der"))) (create-sample-files) (stop-agent)) |