osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/36864?usp=email )

Change subject: tests: don't run osmotestconfig.py in distcheck ......................................................................

tests: don't run osmotestconfig.py in distcheck

Call osmotestconfig.py from contrib/jenkins.sh, instead of running it as part of the vty-tests. Previously it would run twice, once during "make check" and another time during "make distcheck".

A follow-up patch sets state-dir to /var/lib/osmocom/osmo-sgsn in the config that will actually be installed, and because the user that runs the VTY tests typically does not have write access, a copy of the config gets created in the tests directory that does not have this option.

This works fine with the VTY tests, except for osmotestconfig.py when running as part of distcheck. I've tried to figure out why exactly it does not work, but this isn't trivial because the script doesn't show where the actual error is (OS#6456). It doesn't seem like a good use of time to look into this further for now, instead it should be enough running osmotestconfig.py once in contrib/jenkins.sh, and not have it run as part of the VTY tests anymore.

Change-Id: I68e33a229a1cd035a9acef1210068af0e476bff3 --- M contrib/jenkins.sh M tests/Makefile.am 2 files changed, 28 insertions(+), 1 deletion(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/64/36864/1

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 321beef..1b7a4d1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -69,6 +69,8 @@ $MAKE $PARALLEL_MAKE distcheck \ || cat-testlogs.sh

+(cd tests && osmotestconfig.py -p $(realpath ../) -w $(realpath ../) -v) + if [ "$WITH_MANUALS" = "1" ] && [ "$PUBLISH" = "1" ]; then make -C "$base/doc/manuals" publish fi diff --git a/tests/Makefile.am b/tests/Makefile.am index 2c07ac9..da94ebd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -52,7 +52,6 @@

vty-python-test: $(top_builddir)/src/sgsn/osmo-sgsn osmotestvty.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v - osmotestconfig.py -p $(abs_top_srcdir) -w $(abs_top_builddir) -v $(srcdir)/vty_test_runner.py -w $(abs_top_builddir) -v rm -f $(top_builddir)/gsn_restart $(top_builddir)/gtphub_restart_count