[PATCH] osmo-iuh[master]: jenkins.sh: don't build twice

[Neels Hofmeyr]

Hello Jenkins Builder,

I'd like you to reexamine a change.  Please visit

    https://gerrit.osmocom.org/776

to look at the new patch set (#4).

jenkins.sh: don't build twice

Instead of building the same .c files twice, rather verify that the
'make regen' target produces identical .c files as are checked in.

Change-Id: I18e7677d8596f61b883e9db57b4bdd2a5c154ec3
---
M contrib/jenkins.sh
1 file changed, 13 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/76/776/4

diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh
index c24bec2..d3dd5c7 100755
--- a/contrib/jenkins.sh
+++ b/contrib/jenkins.sh
@@ -55,19 +55,23 @@
 
 marker osmo-iuh
 cd "$base"
-# Build using the checked-in asn1 code
-autoreconf --install --force
-./configure
-$MAKE $PARALLEL_MAKE
-LD_LIBRARY_PATH="$inst/lib" $MAKE check
-# distcheck is broken
-#LD_LIBRARY_PATH=$PWD/deps/install/lib $MAKE distcheck
-make clean
 
-# Build with regenerated asn1 code
 autoreconf --install --force
 ./configure
+
+# Verify that checked-in asn1 code is identical to regenerated asn1 code
 PATH="$inst/bin:$PATH" $MAKE $PARALLEL_MAKE -C src regen
+
+git diff-files --quiet
+echo $?
+
+git diff | cat
+
+if ! git diff-files --quiet ; then
+	echo "ERROR: 'make -C src regen' does not match committed asn1 code"
+	exit 1
+fi
+
 $MAKE $PARALLEL_MAKE
 LD_LIBRARY_PATH="$inst/lib" $MAKE check
 # distcheck is broken

-- 
To view, visit https://gerrit.osmocom.org/776
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newpatchset
Gerrit-Change-Id: I18e7677d8596f61b883e9db57b4bdd2a5c154ec3
Gerrit-PatchSet: 4
Gerrit-Project: osmo-iuh
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr at sysmocom.de>