From 48b682c74636deb6036669ae04dc3c1a3ab0de02 Mon Sep 17 00:00:00 2001 From: Frederic Peters Date: Fri, 8 Dec 2006 11:51:05 +0000 Subject: [PATCH] testing metadata files are in $(srcdir) --- tests/Makefile.am | 1 + tests/metadata_tests.c | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 02d58e4d..50a62ebb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -8,6 +8,7 @@ INCLUDES = \ -I$(top_srcdir) \ -I$(top_srcdir)/lasso \ -DTESTSDATADIR=\"$(srcdir)/data/\" \ + -DTESTSMETADATADIR=\"$(srcdir)/metadata/\" \ $(LASSO_CFLAGS) \ $(CHECK_CFLAGS) diff --git a/tests/metadata_tests.c b/tests/metadata_tests.c index 5f5e7cd2..58a11c74 100644 --- a/tests/metadata_tests.c +++ b/tests/metadata_tests.c @@ -32,7 +32,7 @@ START_TEST(test01_metadata_load_der_certificate_from_x509_cert) { LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, - "metadata/metadata_01.xml", NULL, NULL); + TESTSMETADATADIR "/metadata_01.xml", NULL, NULL); fail_unless(provider != NULL, "Can't load DER certificate from "); } END_TEST @@ -40,7 +40,7 @@ END_TEST START_TEST(test02_metadata_load_pem_certificate_from_x509_cert) { LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, - "metadata/metadata_02.xml", NULL, NULL); + TESTSMETADATADIR "/metadata_02.xml", NULL, NULL); fail_unless(provider != NULL, "Can't load PEM certificate from "); } END_TEST @@ -48,7 +48,7 @@ END_TEST START_TEST(test03_metadata_load_der_public_key_from_keyvalue) { LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, - "metadata/metadata_03.xml", NULL, NULL); + TESTSMETADATADIR "/metadata_03.xml", NULL, NULL); fail_unless(provider != NULL, "Can't load DER public key from "); } END_TEST @@ -56,7 +56,7 @@ END_TEST START_TEST(test04_metadata_load_pem_public_key_from_keyvalue) { LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, - "metadata/metadata_04.xml", NULL, NULL); + TESTSMETADATADIR "/metadata_04.xml", NULL, NULL); fail_unless(provider != NULL, "Can't load PEM public key from "); } END_TEST @@ -64,7 +64,7 @@ END_TEST START_TEST(test05_metadata_load_public_key_from_x509_cert) { LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, - "metadata/metadata_05.xml", NULL, NULL); + TESTSMETADATADIR "/metadata_05.xml", NULL, NULL); fail_unless(provider != NULL, "Can't load DER public key from "); } END_TEST