[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Added a buildbot for dwz
On Sat, Mar 16, 2019 at 04:23:25PM +0100, Tom de Vries wrote:
> > To celebrate that dwz now has a testsuite I added a buildbot:
> > https://builder.wildebeest.org/buildbot/#/builders?tags=dwz
> >
>
> I've just pushed a fix for a dejagnu warning on my laptop, and there I
> see no warnings anymore.
>
> However, all builds on the build bot that I checked show:
> ...
> WARNING: Couldn't find the global config file.
> ...
>
> I'm not sure if this should be fixed on the buildbot, or in the sources.
Apparently this comes from not setting the DEJAGNU variable:
There is an optional global site.exp, containing
configuration values that apply to DejaGnu
site-wide. runtest loads these values first. The global
site.exp contains the default values for all targets and
hosts supported by DejaGnu. This global file is identified
by setting the environment variable DEJAGNU to the name of
the file. If DEJAGNU is set, but the file cannot be
located, an error will be raised and runtest will abort.
https://www.gnu.org/software/dejagnu/manual/Customizing-DejaGnu.html
The following seems to always suppress the WARNING:
diff --git a/Makefile b/Makefile
index 1aa208f..2a9898c 100644
--- a/Makefile
+++ b/Makefile
@@ -26,9 +26,14 @@ hello:
dw2-restrict:
$(CC) $(TEST_SRC)/dw2-restrict.S -o $@ || touch $@
+# On some systems we need to set and export DEJAGNU to suppress
+# WARNING: Couldn't find the global config file.
+DEJAGNU ?= /dev/null
+
check: dwz $(TEST_EXECS)
mkdir -p testsuite-bin
cd testsuite-bin; ln -sf $(PWD)/dwz .
+ export DEJAGNU=$(DEJAGNU); \
export PATH=$(PWD)/testsuite-bin:$$PATH; export LC_ALL=C; \
runtest --tool=dwz -srcdir testsuite $(RUNTESTFLAGS)
rm -Rf testsuite-bin $(TEST_EXECS)
Does that make sense?
Thanks,
Mark