zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Dumped tetsuite logs into a separate dir.

Browse source 
Fixed few bugs.
This commit is contained in:
Manuel Canales Esparcia 2006-06-04 17:56:01 +00:00
parent 27f165a8d5
commit a229600026
9 changed files with 145 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
CLFS/clfs.xsl
View file

@ -30,13 +30,13 @@
<xsl:param name="vim-lang" select="1"/> <xsl:param name="vim-lang" select="1"/>
<!-- Time zone --> <!-- Time zone -->
<xsl:param name="timezone" select="America/Toronto"/> <xsl:param name="timezone" select="GMT"/>
<!-- Page size --> <!-- Page size -->
<xsl:param name="page" select="letter"/> <xsl:param name="page" select="letter"/>
<!-- Locale settings --> <!-- Locale settings -->
<xsl:param name="lang" select="en_CA"/> <xsl:param name="lang" select="C"/>
<xsl:template match="/"> <xsl:template match="/">
<xsl:apply-templates select="//sect1"/> <xsl:apply-templates select="//sect1"/>
@ -120,7 +120,7 @@
<xsl:value-of select="substring-before(string(),'make')"/> <xsl:value-of select="substring-before(string(),'make')"/>
<xsl:text>make -k</xsl:text> <xsl:text>make -k</xsl:text>
<xsl:value-of select="substring-after(string(),'make')"/> <xsl:value-of select="substring-after(string(),'make')"/>
<xsl:text> || true&#xA;</xsl:text> <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
@ -165,27 +165,35 @@
<!-- No interactive commands are needed if the .config file is the proper one --> <!-- No interactive commands are needed if the .config file is the proper one -->
<xsl:when test="contains(string(),'menuconfig')"/> <xsl:when test="contains(string(),'menuconfig')"/>
<!-- The Coreutils and Module-Init-Tools test suites are optional --> <!-- The Coreutils and Module-Init-Tools test suites are optional -->
<xsl:when test="($testsuite = '0' or $testsuite = '1') and <xsl:when test="(ancestor::sect1[@id='ch-system-coreutils'] or
(ancestor::sect1[@id='ch-system-coreutils'] or
ancestor::sect1[@id='ch-system-module-init-tools']) and ancestor::sect1[@id='ch-system-module-init-tools']) and
(contains(string(),'check') or (contains(string(),'check') or
contains(string(),'dummy'))"/> contains(string(),'dummy'))">
<xsl:choose>
<xsl:when test="$testsuite = '0' or $testsuite = '1'"/>
<xsl:otherwise>
<xsl:apply-templates/>
<xsl:if test="contains(string(),'check')">
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<!-- Fixing toolchain test suites run --> <!-- Fixing toolchain test suites run -->
<xsl:when test="string() = 'make check' or <xsl:when test="string() = 'make check' or
string() = 'make -k check'"> string() = 'make -k check'">
<xsl:choose> <xsl:choose>
<xsl:when test="$testsuite != '0'"> <xsl:when test="$testsuite != '0'">
<xsl:text>make -k check || true&#xA;</xsl:text> <xsl:text>make -k check &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<xsl:when test="contains(string(),'glibc-check-log')"> <xsl:when test="contains(string(),'glibc-check-log')">
<xsl:choose> <xsl:choose>
<xsl:when test="$testsuite != '0'"> <xsl:when test="$testsuite != '0'">
<xsl:value-of select="substring-before(string(),';')"/> <xsl:value-of select="substring-before(string(),'&gt;g')"/>
<xsl:text> || true&#xA;</xsl:text> <xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
<xsl:value-of select="substring-after(string(),';')"/>
<xsl:text>&#xA;</xsl:text>
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
@ -194,6 +202,9 @@
<xsl:choose> <xsl:choose>
<xsl:when test="$testsuite != '0'"> <xsl:when test="$testsuite != '0'">
<xsl:apply-templates/> <xsl:apply-templates/>
<xsl:if test="contains(string(),'test_summary')">
<xsl:text> &gt;&gt; $TEST_LOG</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text> <xsl:text>&#xA;</xsl:text>
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>

20
CLFS/master.sh
View file

@ -542,6 +542,16 @@ final_system_Makefiles() { #
if [ "$vrs" != "" ] ; then if [ "$vrs" != "" ] ; then
FILE="$name-$vrs.tar.*" FILE="$name-$vrs.tar.*"
wrt_unpack2 "$FILE" wrt_unpack2 "$FILE"
# If the testsuites must be run, initialize the log file
case $name in
binutils | gcc | glibc )
[[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
;;
* )
[[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && wrt_test_log2 "${this_script}"
;;
esac
# If using optimizations, write the instructions
[[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi fi
# #
@ -645,6 +655,16 @@ bm_final_system_Makefiles() { #
if [ "$vrs" != "" ] ; then if [ "$vrs" != "" ] ; then
FILE="$name-$vrs.tar.*" FILE="$name-$vrs.tar.*"
wrt_unpack3 "$FILE" wrt_unpack3 "$FILE"
# If the testsuites must be run, initialize the log file
case $name in
binutils | gcc | glibc )
[[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
;;
* )
[[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && wrt_test_log2 "${this_script}"
;;
esac
# If using optimizations, write the instructions
[[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi fi
# #

31
HLFS/hlfs.xsl
View file

@ -30,14 +30,14 @@
<xsl:param name="testsuite" select="1"/> <xsl:param name="testsuite" select="1"/>
<!-- Time zone --> <!-- Time zone -->
<xsl:param name="timezone" select="America/Toronto"/> <xsl:param name="timezone" select="GMT"/>
<!-- Page size --> <!-- Page size -->
<xsl:param name="page" select="letter"/> <xsl:param name="page" select="letter"/>
<!-- Locale settings --> <!-- Locale settings -->
<xsl:param name="lang" select="en_CA"/> <xsl:param name="lang" select="C"/>
<xsl:param name="lc_all" select="en_CA"/> <xsl:param name="lc_all" select="C"/>
<xsl:template match="/"> <xsl:template match="/">
<xsl:apply-templates select="//sect1"/> <xsl:apply-templates select="//sect1"/>
@ -144,13 +144,13 @@
$testsuite = '3')"> $testsuite = '3')">
<xsl:choose> <xsl:choose>
<xsl:when test="ancestor::sect1[@id='ch-system-gcc']"> <xsl:when test="ancestor::sect1[@id='ch-system-gcc']">
<xsl:text>make -k check || true&#xA;</xsl:text> <xsl:text>make -k check &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:value-of select="substring-before(string(),'make')"/> <xsl:value-of select="substring-before(string(),'make')"/>
<xsl:text>make -k</xsl:text> <xsl:text>make -k</xsl:text>
<xsl:value-of select="substring-after(string(),'make')"/> <xsl:value-of select="substring-after(string(),'make')"/>
<xsl:text> || true&#xA;</xsl:text> <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:if> </xsl:if>
@ -211,12 +211,22 @@
<xsl:text>&#xA;</xsl:text> <xsl:text>&#xA;</xsl:text>
</xsl:when> </xsl:when>
<!-- The Coreutils and Module-Init-Tools test suites are optional --> <!-- The Coreutils and Module-Init-Tools test suites are optional -->
<xsl:when test="($testsuite = '0' or $testsuite = '1') and <xsl:when test="(ancestor::sect1[@id='ch-system-coreutils'] or
(ancestor::sect1[@id='ch-system-coreutils'] or
ancestor::sect1[@id='ch-system-module-init-tools']) and ancestor::sect1[@id='ch-system-module-init-tools']) and
(contains(string(),'check') or (contains(string(),'check') or
contains(string(),'distclean') or contains(string(),'distclean') or
contains(string(),'dummy'))"/> contains(string(),'dummy'))">
<xsl:choose>
<xsl:when test="$testsuite = '0' or $testsuite = '1'"/>
<xsl:otherwise>
<xsl:apply-templates/>
<xsl:if test="contains(string(),'check')">
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<!-- Fixing toolchain test suites run --> <!-- Fixing toolchain test suites run -->
<xsl:when test="string() = 'make check' or <xsl:when test="string() = 'make check' or
string() = 'make -k check'"> string() = 'make -k check'">
@ -224,8 +234,7 @@
<xsl:when test="(($testsuite = '1' or $testsuite = '2') and <xsl:when test="(($testsuite = '1' or $testsuite = '2') and
ancestor::chapter[@id='chapter-building-system']) or ancestor::chapter[@id='chapter-building-system']) or
$testsuite = '3'"> $testsuite = '3'">
<xsl:text>make -k check || true</xsl:text> <xsl:text>make -k check &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
<xsl:text>&#xA;</xsl:text>
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
@ -234,7 +243,7 @@
<xsl:choose> <xsl:choose>
<xsl:when test="$testsuite != '0'"> <xsl:when test="$testsuite != '0'">
<xsl:value-of select="substring-before(string(),'make check')"/> <xsl:value-of select="substring-before(string(),'make check')"/>
<xsl:text>make -k check || true&#xA;</xsl:text> <xsl:text>make -k check &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>

19
HLFS/master.sh
View file

@ -143,10 +143,13 @@ chapter5_Makefiles() { # Bootstrap or temptools phase
# Insert instructions for unpacking the package and to set the PKGDIR variable. # Insert instructions for unpacking the package and to set the PKGDIR variable.
case $this_script in case $this_script in
*binutils* ) *binutils* )
wrt_unpack "$FILE" 1 ;; # Do not delete an existing package directories wrt_unpack "$FILE" 1 ;; # Do not delete an existing package directories
*) *)
wrt_unpack "$FILE" ;; wrt_unpack "$FILE" ;;
esac esac
# If the testsuites must be run, initialize the log file
[[ "$TEST" = "3" ]] && wrt_test_log "${this_script}"
# If using optimizations, write the instructions
[[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi fi
@ -314,6 +317,16 @@ chapter6_Makefiles() { # sysroot or chroot build phase
esac esac
wrt_unpack2 "$FILE" wrt_unpack2 "$FILE"
wrt_target_vars wrt_target_vars
# If the testsuites must be run, initialize the log file
case $name in
binutils | gcc | glibc )
[[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
;;
* )
[[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && wrt_test_log2 "${this_script}"
;;
esac
# If using optimizations, write the instructions
[[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi fi

34
LFS/lfs.xsl
View file

@ -24,13 +24,13 @@
<xsl:param name="vim-lang" select="1"/> <xsl:param name="vim-lang" select="1"/>
<!-- Time zone --> <!-- Time zone -->
<xsl:param name="timezone" select="America/Toronto"/> <xsl:param name="timezone" select="GMT"/>
<!-- Page size --> <!-- Page size -->
<xsl:param name="page" select="letter"/> <xsl:param name="page" select="letter"/>
<!-- Locale settings --> <!-- Locale settings -->
<xsl:param name="lang" select="en_CA"/> <xsl:param name="lang" select="C"/>
<xsl:template match="/"> <xsl:template match="/">
<xsl:apply-templates select="//sect1"/> <xsl:apply-templates select="//sect1"/>
@ -112,7 +112,7 @@
<xsl:value-of select="substring-before(string(),'make')"/> <xsl:value-of select="substring-before(string(),'make')"/>
<xsl:text>make -k</xsl:text> <xsl:text>make -k</xsl:text>
<xsl:value-of select="substring-after(string(),'make')"/> <xsl:value-of select="substring-after(string(),'make')"/>
<xsl:text> || true&#xA;</xsl:text> <xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
@ -147,11 +147,21 @@
<xsl:text>cp -v ../kernel-config .config&#xA;</xsl:text> <xsl:text>cp -v ../kernel-config .config&#xA;</xsl:text>
</xsl:when> </xsl:when>
<!-- The Coreutils and Module-Init-Tools test suites are optional --> <!-- The Coreutils and Module-Init-Tools test suites are optional -->
<xsl:when test="($testsuite = '0' or $testsuite = '1') and <xsl:when test="(ancestor::sect1[@id='ch-system-coreutils'] or
(ancestor::sect1[@id='ch-system-coreutils'] or
ancestor::sect1[@id='ch-system-module-init-tools']) and ancestor::sect1[@id='ch-system-module-init-tools']) and
(contains(string(),'check') or (contains(string(),'check') or
contains(string(),'dummy'))"/> contains(string(),'dummy'))">
<xsl:choose>
<xsl:when test="$testsuite = '0' or $testsuite = '1'"/>
<xsl:otherwise>
<xsl:apply-templates/>
<xsl:if test="contains(string(),'check')">
<xsl:text> &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<!-- Fixing toolchain test suites run --> <!-- Fixing toolchain test suites run -->
<xsl:when test="string() = 'make check' or <xsl:when test="string() = 'make check' or
string() = 'make -k check'"> string() = 'make -k check'">
@ -159,18 +169,15 @@
<xsl:when test="(($testsuite = '1' or $testsuite = '2') and <xsl:when test="(($testsuite = '1' or $testsuite = '2') and
ancestor::chapter[@id='chapter-building-system']) or ancestor::chapter[@id='chapter-building-system']) or
$testsuite = '3'"> $testsuite = '3'">
<xsl:text>make -k check || true</xsl:text> <xsl:text>make -k check &gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
<xsl:text>&#xA;</xsl:text>
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
<xsl:when test="contains(string(),'glibc-check-log')"> <xsl:when test="contains(string(),'glibc-check-log')">
<xsl:choose> <xsl:choose>
<xsl:when test="$testsuite != '0'"> <xsl:when test="$testsuite != '0'">
<xsl:value-of select="substring-before(string(),'&#xA;')"/> <xsl:value-of select="substring-before(string(),'2&gt;&amp;1')"/>
<xsl:text> || true&#xA;</xsl:text> <xsl:text>&gt;&gt; $TEST_LOG 2&gt;&amp;1 || true&#xA;</xsl:text>
<xsl:value-of select="substring-after(string(),'&#xA;')"/>
<xsl:text>&#xA;</xsl:text>
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</xsl:when> </xsl:when>
@ -181,6 +188,9 @@
ancestor::chapter[@id='chapter-building-system']) or ancestor::chapter[@id='chapter-building-system']) or
$testsuite = '3'"> $testsuite = '3'">
<xsl:apply-templates/> <xsl:apply-templates/>
<xsl:if test="contains(string(),'test_summary')">
<xsl:text> &gt;&gt; $TEST_LOG</xsl:text>
</xsl:if>
<xsl:text>&#xA;</xsl:text> <xsl:text>&#xA;</xsl:text>
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>

13
LFS/master.sh
View file

@ -112,6 +112,9 @@ chapter5_Makefiles() {
# Insert instructions for unpacking the package and to set the PKGDIR variable. # Insert instructions for unpacking the package and to set the PKGDIR variable.
wrt_unpack "$FILE" wrt_unpack "$FILE"
# If the testsuites must be run, initialize the log file
[[ "$TEST" = "3" ]] && wrt_test_log "${this_script}"
# If using optimizations, write the instructions
[[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi fi
@ -216,6 +219,16 @@ chapter6_Makefiles() {
if [ "$vrs" != "" ] ; then if [ "$vrs" != "" ] ; then
FILE="$name-$vrs.tar.*" FILE="$name-$vrs.tar.*"
wrt_unpack2 "$FILE" wrt_unpack2 "$FILE"
# If the testsuites must be run, initialize the log file
case $name in
binutils | gcc | glibc )
[[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
;;
* )
[[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && wrt_test_log2 "${this_script}"
;;
esac
# If using optimizations, write the instructions
[[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
fi fi

26
common/common-functions
View file

@ -276,7 +276,7 @@ wrt_unpack2() { #
( (
cat << EOF cat << EOF
@\$(call unpack2,$FILE) @\$(call unpack2,$FILE)
@ROOT=\`head -n1 \$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\ @ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\
echo "export PKGDIR=\$(SRC)/\$\$ROOT" > envars echo "export PKGDIR=\$(SRC)/\$\$ROOT" > envars
EOF EOF
) >> $MKFILE.tmp ) >> $MKFILE.tmp
@ -301,6 +301,30 @@ EOF
) >> $MKFILE.tmp ) >> $MKFILE.tmp
} }
#----------------------------------#
wrt_test_log() { # Initialize testsuite log file
#----------------------------------#
local TESTLOGFILE=$1
(
cat << EOF
@echo "export TEST_LOG=$TESTLOGDIR/$TESTLOGFILE" >> envars && \\
su - lfs -c "echo -e '\n\`date\`\n' >$TESTLOGDIR/$TESTLOGFILE"
EOF
) >> $MKFILE.tmp
}
#----------------------------------#
wrt_test_log2() { #
#----------------------------------#
local TESTLOGFILE=$1
(
cat << EOF
@echo "export TEST_LOG=/$SCRIPT_ROOT/test-logs/$TESTLOGFILE" >> envars && \\
echo -e "\n\`date\`\n" >test-logs/$TESTLOGFILE
EOF
) >> $MKFILE.tmp
}
#----------------------------------# #----------------------------------#
wrt_target_vars() { # Target vars for hlfs (cross-build method) wrt_target_vars() { # Target vars for hlfs (cross-build method)
#----------------------------------# #----------------------------------#

5
common/config
View file

@ -89,8 +89,9 @@ RUN_FARCE=0
#--- Working directories #--- Working directories
SCRIPT_ROOT=jhalfs SCRIPT_ROOT=jhalfs
JHALFSDIR=$BUILDDIR/$SCRIPT_ROOT JHALFSDIR=$BUILDDIR/$SCRIPT_ROOT
LOGDIR=$JHALFSDIR/logs LOGDIR=$JHALFSDIR/logs
TESTLOGDIR=$JHALFSDIR/test-logs
#--- File listing package contents (from where package sources dir is extracted) #--- File listing package contents (from where package sources dir is extracted)
PKG_LST=unpacked PKG_LST=unpacked

4
master.sh
View file

@ -138,6 +138,7 @@ while test $# -gt 0 ; do
BUILDDIR=$1 BUILDDIR=$1
JHALFSDIR=$BUILDDIR/${SCRIPT_ROOT} JHALFSDIR=$BUILDDIR/${SCRIPT_ROOT}
LOGDIR=$JHALFSDIR/logs LOGDIR=$JHALFSDIR/logs
TESTLOGDIR=$JHALFSDIR/test-logs
MKFILE=$JHALFSDIR/Makefile MKFILE=$JHALFSDIR/Makefile
;; ;;
esac esac
@ -479,10 +480,13 @@ if [[ ! -d $LOGDIR ]]; then
fi fi
>$LOGDIR/$LOG >$LOGDIR/$LOG
# #
[[ "$TEST" != "0" ]] && [[ ! -d $TESTLOGDIR ]] && install -d -m 1777 $TESTLOGDIR
# #
if [[ "$PWD" != "$JHALFSDIR" ]]; then if [[ "$PWD" != "$JHALFSDIR" ]]; then
cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/ cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
#
[[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/ [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/
#
if [[ "$COMPARE" != "0" ]] ; then if [[ "$COMPARE" != "0" ]] ; then
mkdir -p $JHALFSDIR/extras mkdir -p $JHALFSDIR/extras
cp extras/* $JHALFSDIR/extras cp extras/* $JHALFSDIR/extras