- Timestamp:
- 06/04/2006 05:56:01 PM (18 years ago)
- Branches:
- 1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- c665386
- Parents:
- 27f165a
- Location:
- LFS
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
LFS/lfs.xsl
r27f165a ra229600 25 25 26 26 <!-- Time zone --> 27 <xsl:param name="timezone" select=" America/Toronto"/>27 <xsl:param name="timezone" select="GMT"/> 28 28 29 29 <!-- Page size --> … … 31 31 32 32 <!-- Locale settings --> 33 <xsl:param name="lang" select=" en_CA"/>33 <xsl:param name="lang" select="C"/> 34 34 35 35 <xsl:template match="/"> … … 113 113 <xsl:text>make -k</xsl:text> 114 114 <xsl:value-of select="substring-after(string(),'make')"/> 115 <xsl:text> || true
</xsl:text>115 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 116 116 </xsl:if> 117 117 </xsl:template> … … 148 148 </xsl:when> 149 149 <!-- The Coreutils and Module-Init-Tools test suites are optional --> 150 <xsl:when test="($testsuite = '0' or $testsuite = '1') and 151 (ancestor::sect1[@id='ch-system-coreutils'] or 150 <xsl:when test="(ancestor::sect1[@id='ch-system-coreutils'] or 152 151 ancestor::sect1[@id='ch-system-module-init-tools']) and 153 152 (contains(string(),'check') or 154 contains(string(),'dummy'))"/> 153 contains(string(),'dummy'))"> 154 <xsl:choose> 155 <xsl:when test="$testsuite = '0' or $testsuite = '1'"/> 156 <xsl:otherwise> 157 <xsl:apply-templates/> 158 <xsl:if test="contains(string(),'check')"> 159 <xsl:text> >> $TEST_LOG 2>&1 || true</xsl:text> 160 </xsl:if> 161 <xsl:text>
</xsl:text> 162 </xsl:otherwise> 163 </xsl:choose> 164 </xsl:when> 155 165 <!-- Fixing toolchain test suites run --> 156 166 <xsl:when test="string() = 'make check' or … … 160 170 ancestor::chapter[@id='chapter-building-system']) or 161 171 $testsuite = '3'"> 162 <xsl:text>make -k check || true</xsl:text> 163 <xsl:text>
</xsl:text> 172 <xsl:text>make -k check >> $TEST_LOG 2>&1 || true
</xsl:text> 164 173 </xsl:when> 165 174 </xsl:choose> … … 168 177 <xsl:choose> 169 178 <xsl:when test="$testsuite != '0'"> 170 <xsl:value-of select="substring-before(string(),'
')"/> 171 <xsl:text> || true
</xsl:text> 172 <xsl:value-of select="substring-after(string(),'
')"/> 173 <xsl:text>
</xsl:text> 179 <xsl:value-of select="substring-before(string(),'2>&1')"/> 180 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 174 181 </xsl:when> 175 182 </xsl:choose> … … 182 189 $testsuite = '3'"> 183 190 <xsl:apply-templates/> 191 <xsl:if test="contains(string(),'test_summary')"> 192 <xsl:text> >> $TEST_LOG</xsl:text> 193 </xsl:if> 184 194 <xsl:text>
</xsl:text> 185 195 </xsl:when> -
LFS/master.sh
r27f165a ra229600 113 113 # Insert instructions for unpacking the package and to set the PKGDIR variable. 114 114 wrt_unpack "$FILE" 115 # If the testsuites must be run, initialize the log file 116 [[ "$TEST" = "3" ]] && wrt_test_log "${this_script}" 117 # If using optimizations, write the instructions 115 118 [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" 116 119 fi … … 217 220 FILE="$name-$vrs.tar.*" 218 221 wrt_unpack2 "$FILE" 222 # If the testsuites must be run, initialize the log file 223 case $name in 224 binutils | gcc | glibc ) 225 [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}" 226 ;; 227 * ) 228 [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && wrt_test_log2 "${this_script}" 229 ;; 230 esac 231 # If using optimizations, write the instructions 219 232 [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" 220 233 fi
Note:
See TracChangeset
for help on using the changeset viewer.