commit 656cc9254d13369fb4bca4fa69e3808bc6e0748e
parent 2b36d8322d844792da307ca420c3f18742f0a4d3
Author: Christian Grothoff <grothoff@gnunet.org>
Date: Sat, 2 Dec 2023 22:16:08 +0900
-fix dist issues
Diffstat:
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
@@ -6,5 +6,10 @@ EXTRA_DIST = config.rpath \
pkgconfigdatadir = $(libdir)/pkgconfig
pkgconfigdata_DATA = libextractor.pc
+DISTCLEANFILES = \
+ libextractor.pc \
+ libextractor.pc.in \
+ libextractor-uninstalled.sh \
+ libextractor-uninstalled.pc
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4
diff --git a/src/plugins/test_lib.c b/src/plugins/test_lib.c
@@ -27,6 +27,8 @@
#include <sys/types.h>
#include <regex.h>
#include <signal.h>
+#include <stdbool.h>
+#include <unistd.h>
/**
* Function that libextractor calls for each
@@ -143,6 +145,7 @@ run (const char *plugin_name,
unsigned int i;
unsigned int j;
int ret;
+ bool skipped = false;
pl = EXTRACTOR_plugin_add_config (NULL,
plugin_name,
@@ -155,6 +158,7 @@ run (const char *plugin_name,
fprintf (stderr,
"Failed to access %s, skipping test\n",
ps[i].filename);
+ skipped = true;
continue;
}
EXTRACTOR_extract (pl,
@@ -164,6 +168,8 @@ run (const char *plugin_name,
ps[i].solution);
}
EXTRACTOR_plugin_remove_all (pl);
+ if (skipped)
+ return 0;
ret = 0;
for (i = 0; NULL != ps[i].filename; i++)
for (j = 0; -1 != ps[i].solution[j].solved; j++)