Skip to content

Fix uri_signing unit test for out of source builds #8040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bneradt merged 1 commit into from
Jul 6, 2021
Merged

Fix uri_signing unit test for out of source builds #8040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@ TS_CHECK_BROTLI
TS_CHECK_LUAJIT

#
# Enable experimental/uri_singing plugin
# Enable experimental/uri_signing plugin
# This is here, instead of above, because it needs to know if PCRE is available.
#

Expand Down
7 changes: 6 additions & 1 deletion plugins/experimental/uri_signing/Makefile.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ experimental_uri_signing_uri_signing_la_LIBADD = @LIBJANSSON@ @LIBCJOSE@ @LIBPCR

check_PROGRAMS += experimental/uri_signing/test_uri_signing

experimental_uri_signing_test_uri_signing_CPPFLAGS = $(AM_CPPFLAGS) -I$(abs_top_srcdir)/tests/include -DURI_SIGNING_UNIT_TEST
experimental_uri_signing_test_uri_signing_CPPFLAGS = \
$(AM_CPPFLAGS) \
-I$(abs_top_srcdir)/tests/include \
-DURI_SIGNING_UNIT_TEST \
-DSRCDIR=\"$(srcdir)\"

experimental_uri_signing_test_uri_signing_LDADD = @LIBJANSSON@ @LIBCJOSE@ @LIBPCRE@ -lm -lcrypto
experimental_uri_signing_test_uri_signing_SOURCES = \
experimental/uri_signing/unit_tests/uri_signing_test.cc \
Expand Down
4 changes: 2 additions & 2 deletions plugins/experimental/uri_signing/unit_tests/uri_signing_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ TEST_CASE("7", "[TestsConfig]")

SECTION("Config Loading ID Field")
{
struct config *cfg = read_config("experimental/uri_signing/unit_tests/testConfig.config");
struct config *cfg = read_config(SRCDIR "/experimental/uri_signing/unit_tests/testConfig.config");
REQUIRE(cfg != NULL);
REQUIRE(strcmp(config_get_id(cfg), "tester") == 0);
config_delete(cfg);
Expand Down Expand Up @@ -603,7 +603,7 @@ jws_validation_helper(const char *url, const char *package, struct config *cfg)
TEST_CASE("8", "[TestsWithConfig]")
{
INFO("TEST 8, Tests Involving Validation with Config");
struct config *cfg = read_config("experimental/uri_signing/unit_tests/testConfig.config");
struct config *cfg = read_config(SRCDIR "/experimental/uri_signing/unit_tests/testConfig.config");

SECTION("Validation of Valid Aud String in JWS")
{
Expand Down