oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

move failure testing into build function

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12090 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-04-17 12:55:02 +00:00
parent f491d7b6af
commit 7d7b1f39bc
1 changed files with 15 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
tools/build.sh
View File

@@ -21,8 +21,6 @@ dont_build="openssl-0.9.7.*krb4-1.2.* ${dont_build}"
dont_build="openssl-0.9.6.*heimdal-0.5.*osf4.* ${dont_build}" dont_build="openssl-0.9.6.*heimdal-0.5.*osf4.* ${dont_build}"
#local openssl 09.7 and broken kuser/Makefile.am #local openssl 09.7 and broken kuser/Makefile.am
dont_build="openssl-0.9.6.*heimdal-0.5.*freebsd4.8.* ${dont_build}" dont_build="openssl-0.9.6.*heimdal-0.5.*freebsd4.8.* ${dont_build}"
#krb4-config broken test
dont_build="openssl-*.*heimdal-0.5.*krb4-1.2.* ${dont_build}"
failed= failed=
# Allow override # Allow override
@@ -104,6 +102,7 @@ build () {
prog=$2 prog=$2
ver=$3 ver=$3
confprog=$4 confprog=$4
checks=$5
pv=${prog}-${ver} pv=${prog}-${ver}
mkdir tmp || logerror "failed to build tmpdir" mkdir tmp || logerror "failed to build tmpdir"
cd tmp || logerror "failed to change dir to tmpdir" cd tmp || logerror "failed to change dir to tmpdir"
@@ -128,6 +127,7 @@ build () {
do_check_p make_check_version ${real_ver} || \ do_check_p make_check_version ${real_ver} || \
{ ${opt_n} make check >> ${logfile} 2>&1 || return 1 ; } { ${opt_n} make check >> ${logfile} 2>&1 || return 1 ; }
${opt_n} cd .. ${opt_n} cd ..
[ "${checks}" != "" ] && ${opt_n} ${checks} >> ${logfile} 2>&1
return 0 return 0
} }
@@ -165,13 +165,9 @@ for vo in ${openssl_versions} ; do
v="openssl-${vo}-heimdal-${vh}" v="openssl-${vo}-heimdal-${vh}"
build "${v}" \ build "${v}" \
heimdal ${vh} \ heimdal ${vh} \
"configure ${wok4} ${wssl}-${vo} ${wssli}-${vo}/include" || \ "configure ${wok4} ${wssl}-${vo} ${wssli}-${vo}/include" \
{ failed="${failed} ${v}" ; continue ; } "${targetdir}/heimdal-${vh}/bin/krb5-config --libs | grep lcrypto" \ || \
if ! ( ${targetdir}/heimdal-${vh}/bin/krb5-config --libs | \ { failed="${failed} ${v}" ; logprint ${v} failed ; }
grep lcrypto) >/dev/null 2>&1 ; then
logprint "** failed to build with openssl"
failed="${failed} ${v}"
fi
done done
done done
@@ -181,13 +177,9 @@ for vo in ${openssl_versions} ; do
v="openssl-${vo}-krb4-${vk}" v="openssl-${vo}-krb4-${vk}"
build "${v}" \ build "${v}" \
krb4 ${vk} \ krb4 ${vk} \
"configure ${wssl}-${vo}" || \ "configure ${wssl}-${vo}" \
{ failed="${failed} ${v}" ; continue ; } "${targetdir}/krb4-${vk}/bin/krb4-config --libs | grep lcrypto"|| \
if ! ( ${targetdir}/krb4-${vk}/bin/krb4-config --libs | \ { failed="${failed} ${v}" ; logprint ${v} failed ; }
grep lcrypto) >/dev/null 2>&1 ; then
logprint "*** failed to build with openssl"
failed="${failed} ${v}"
fi
done done
done done
@@ -198,40 +190,21 @@ for vo in ${openssl_versions} ; do
v="openssl-${vo}-krb4-${vk}-heimdal-${vh}" v="openssl-${vo}-krb4-${vk}-heimdal-${vh}"
build "${v}" \ build "${v}" \
heimdal ${vh} \ heimdal ${vh} \
"configure ${wk4c}-${vk}${bk4c} ${wssl}-${vo} ${wssli}-${vo}/include" || \ "configure ${wk4c}-${vk}${bk4c} ${wssl}-${vo} ${wssli}-${vo}/include" \
{ failed="${failed} ${v}" ; continue ; } "${targetdir}/heimdal-${vh}/bin/krb5-config --libs | grep lcrypto && ${targetdir}/heimdal-${vh}/bin/krb5-config --libs | grep krb4" \
if ! ( ${targetdir}/heimdal-${vh}/bin/krb5-config --libs | \ || \
grep lcrypto) >/dev/null 2>&1 ; then { failed="${failed} ${v}" ; logprint ${v} failed ; }
logprint "*** failed to build with openssl"
failed="${failed} ${v}"
continue
fi
if ! ( ${targetdir}/heimdal-${vh}/bin/krb5-config --libs | \
grep krb4) >/dev/null 2>&1 ; then
logprint "*** failed to build with krb4"
failed="${failed} ${v}"
fi
done done
done done
done done
logprint === building heimdal without krb4 and openssl versions logprint === building heimdal without krb4 and openssl versions
for vh in ${heimdal_versions} ; do for vh in ${heimdal_versions} ; do
build "des-heimdal-${vh}" \ v="des-heimdal-${vh}"
build "${v}" \
heimdal ${vh} \ heimdal ${vh} \
"configure ${wok4} ${wossl}" || \ "configure ${wok4} ${wossl}" || \
{ failed="${failed} ${v}" ; continue ; } { failed="${failed} ${v}" ; logprint ${v} failed ; }
if ( ${targetdir}/heimdal-${vh}/bin/krb5-config --libs | \
grep lcrypto) >/dev/null 2>&1 ; then
logprint "*** failed to build WITHOUT openssl"
failed="${failed} ${v}"
continue
fi
if ( ${targetdir}/heimdal-${vh}/bin/krb5-config --libs | \
grep krb4 ) >/dev/null 2>&1 ; then
logprint "*** failed to build WITHOUT krb4"
failed="${failed} ${v}"
fi
done done
logprint all done logprint all done