CI: add make distcheck to build

Signed-off-by: Hans Zandbelt <hans.zandbelt@zmartzone.eu>

Author: zandbelt

.github/workflows/build.yml

@@ -50,3 +50,7 @@ jobs:
 
     - name: Test
       run: make check || (cat test-suite.log && exit -1)
+
+    - name: Distcheck
+      run: make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-nginx=/tmp/nginx" DESTDIR="/tmp/mod_auth_openidc"
+ 

Makefile.am

@@ -31,9 +31,7 @@ includesub_HEADERS = \
 	include/oauth2/openidc.h \
 	include/oauth2/session.h \
 	include/oauth2/cfg.h \
-	include/oauth2/util.h
-
-nodist_includesub_HEADERS = \
+	include/oauth2/util.h \
 	include/oauth2/version.h
 
 #

test/check_liboauth2.h

@@ -109,8 +109,14 @@ void liboauth2_check_register_http_callbacks(
 			p = strrchr(path, '.');                                \
 			if (p)                                                 \
 				*p = '\0';                                     \
+			p = path; \
+            while (*p == '.') { \
+				p++; \
+                if (*p == '/') p++; \
+			} \
+            if (*p == '/') p++; \
 			_http_base_path =                                      \
-			    oauth2_stradd(NULL, "/", path, NULL);              \
+			    oauth2_stradd(NULL, "/", p, NULL);              \
 			oauth2_mem_free(path);                                 \
 		}                                                              \
 		return _http_base_path;                                        \

test/check_openidc.c

@@ -534,6 +534,7 @@ START_TEST(test_openidc_resolver)
 	oauth2_cfg_openidc_t *c = NULL;
 	oauth2_http_request_t *r = NULL;
 	oauth2_openidc_provider_t *provider = NULL;
+	char filename[512];
 
 	c = oauth2_cfg_openidc_init(_log);
 	r = oauth2_http_request_init(_log);
@@ -550,8 +551,9 @@ START_TEST(test_openidc_resolver)
 	oauth2_openidc_provider_free(_log, provider);
 	provider = NULL;
 
+	sprintf((char *)filename, "%s/%s", getenv("srcdir") ? getenv("srcdir") : ".", "test/provider.json");
 	rv = oauth2_cfg_openidc_provider_resolver_set_options(
-	    _log, c, "file", "./test/provider.json", NULL);
+	    _log, c, "file", filename, NULL);
 	ck_assert_ptr_eq(rv, NULL);
 
 	rc = _oauth2_openidc_provider_resolve(_log, c, r, NULL, &provider);
@@ -640,12 +642,14 @@ START_TEST(test_openidc_client)
 	char *rv = NULL;
 	oauth2_cfg_openidc_t *cfg = NULL;
 	oauth2_openidc_client_t *client = NULL;
+	char filename[512];
 
 	cfg = oauth2_cfg_openidc_init(_log);
 	ck_assert_ptr_ne(cfg, NULL);
 
+	sprintf((char *)filename, "%s/%s", getenv("srcdir") ? getenv("srcdir") : ".", "test/client.json");
 	rv = oauth2_openidc_client_set_options(
-	    _log, cfg, "file", "./test/client.json", "ssl_verify=false");
+	    _log, cfg, "file", filename, "ssl_verify=false");
 	ck_assert_ptr_eq(rv, NULL);
 
 	client = oauth2_cfg_openidc_client_get(_log, cfg);