diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 04:24:32 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 04:24:32 +0000 |
commit | 35cadacd2bb9383686753731e31bd7e145fb2506 (patch) | |
tree | 4489adbde75a837989533837185b2b8369a0bf68 /buildtest.sh | |
parent | Adding debian version 9.1-0.1. (diff) | |
download | frr-35cadacd2bb9383686753731e31bd7e145fb2506.tar.xz frr-35cadacd2bb9383686753731e31bd7e145fb2506.zip |
Merging upstream version 10.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-x | buildtest.sh | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/buildtest.sh b/buildtest.sh index 7edc4a5..90ef60e 100755 --- a/buildtest.sh +++ b/buildtest.sh @@ -5,7 +5,7 @@ # builds some git commit of FRR in some different configurations # usage: buildtest.sh [commit [configurations...]] -basecfg="--prefix=/usr --enable-user=frr --enable-group=frr --enable-vty-group=frr --enable-configfile-mask=0660 --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc/frr --localstatedir=/var/run/frr --libdir=/usr/lib64/frr --enable-rtadv --disable-static --enable-isisd --enable-multipath=0 --enable-pimd --enable-werror" +basecfg="--prefix=/usr --enable-user=frr --enable-group=frr --enable-vty-group=frr --enable-configfile-mask=0660 --enable-logfile-mask=0640 --enable-vtysh --sysconfdir=/etc --localstatedir=/var --libdir=/usr/lib64/frr --enable-rtadv --disable-static --enable-isisd --enable-multipath=0 --enable-pimd --enable-werror" configs_base="gcc|$basecfg" @@ -37,9 +37,10 @@ trap errfunc ERR COMMITREF="$1" COMMITISH="`git rev-list --max-count=1 ${COMMITREF:-HEAD}`" -TEMP="`mktemp -t -d frrbuild.XXXXXX`" +TEMP="`mktemp -d -t frrbuild.XXXXXX`" BASE="`pwd`" CONFIGS="$2" +MAKE="${MAKE:-make}" echo using temporary directory: $TEMP echo git commit used: @@ -59,7 +60,7 @@ echo -e "\n\n\n\n\033[33;1mmaking dist tarball\033[m" mkdir build_dist cd build_dist ../source/configure -make distdir=sdist dist-gzip +${MAKE} distdir=sdist dist-gzip cd .. tar zxvf build_dist/sdist.tar.gz @@ -79,9 +80,9 @@ for cfg in ${CONFIGS:-$defconfigs}; do mkdir "$bdir" cd "$bdir" ../sdist/configure $args - make -j5 - make check - make DESTDIR="$TEMP/inst_$cfg" install + ${MAKE} -j5 + ${MAKE} check + ${MAKE} DESTDIR="$TEMP/inst_$cfg" install cd .. done |