[ndctl] contrib/do_abidiff: make the build more robust

Commit Message

Verma, Vishal L July 11, 2018, 9:23 p.m. UTC

Use the mock config to determine the release to build for, as that will
result in a build version for the running system. If the build were to
fail, ensure we catch that, and if the build artifacts are missing,
error out on that.

Signed-off-by: Vishal Verma <[e-mail]>
---
 contrib/do_abidiff | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

Patch

diff --git a/contrib/do_abidiff b/contrib/do_abidiff
index a520c3c..0bd7a16 100755
--- a/contrib/do_abidiff
+++ b/contrib/do_abidiff
@@ -27,8 +27,10 @@  build_rpm()
 
 	# build and copy RPMs
 	version="$(./git-version)"
+	release="f$(basename $(readlink -f /etc/mock/default.cfg) | cut -d- -f2)"
 	git archive  --format=tar --prefix="ndctl-${version}/" HEAD | gzip > ndctl-${version}.tar.gz
-	fedpkg --release master --module-name ndctl mockbuild
+	fedpkg --release $release --module-name ndctl mockbuild
+	[ "$?" -eq 0 ] || err "error building $ref"
 	mkdir -p release/rel_${ref}/
 	cp results_ndctl/*/*/*.x86_64.rpm release/rel_${ref}/
 
@@ -52,6 +54,8 @@  do_diff()
 	local new_lib="$(find . -regex "./release/rel_${new}/${pkg}-libs-[0-9]+.*" | head -1)"
 
 	[ -n "$pkg" ] || err "specify a package for diff (ndctl, daxctl)"
+	[ -n "$old_base" ] || err "$pkg: old_base empty, possible build failure"
+	[ -n "$new_base" ] || err "$pkg: new_base empty, possible build failure"
 
 	abipkgdiff --dso-only --no-added-syms --harmless --drop-private-types \
 		--devel1 "$old_dev" --devel2 "$new_dev" \