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
This commit is contained in:
parent
e75a6297da
commit
477f636ba3
|
@ -55,19 +55,22 @@ build_dep asn1c aper-prefix
|
||||||
|
|
||||||
marker osmo-iuh
|
marker osmo-iuh
|
||||||
cd "$base"
|
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
|
autoreconf --install --force
|
||||||
./configure
|
./configure
|
||||||
|
|
||||||
|
# Verify that checked-in asn1 code is identical to regenerated asn1 code
|
||||||
PATH="$inst/bin:$PATH" $MAKE $PARALLEL_MAKE -C src regen
|
PATH="$inst/bin:$PATH" $MAKE $PARALLEL_MAKE -C src regen
|
||||||
|
|
||||||
|
git diff-files
|
||||||
|
|
||||||
|
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
|
$MAKE $PARALLEL_MAKE
|
||||||
LD_LIBRARY_PATH="$inst/lib" $MAKE check
|
LD_LIBRARY_PATH="$inst/lib" $MAKE check
|
||||||
# distcheck is broken
|
# distcheck is broken
|
||||||
|
|
Loading…
Reference in New Issue