Changeset e35e794
- Timestamp:
- 06/04/2006 05:59:02 PM (18 years ago)
- Branches:
- experimental
- Children:
- 9199a13
- Parents:
- 4fe29a2
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
CLFS/clfs.xsl
r4fe29a2 re35e794 31 31 32 32 <!-- Time zone --> 33 <xsl:param name="timezone" select=" America/Toronto"/>33 <xsl:param name="timezone" select="GMT"/> 34 34 35 35 <!-- Page size --> … … 37 37 38 38 <!-- Locale settings --> 39 <xsl:param name="lang" select=" en_CA"/>39 <xsl:param name="lang" select="C"/> 40 40 41 41 <xsl:template match="/"> … … 121 121 <xsl:text>make -k</xsl:text> 122 122 <xsl:value-of select="substring-after(string(),'make')"/> 123 <xsl:text> || true
</xsl:text>123 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 124 124 </xsl:if> 125 125 </xsl:template> … … 166 166 <xsl:when test="contains(string(),'menuconfig')"/> 167 167 <!-- The Coreutils and Module-Init-Tools test suites are optional --> 168 <xsl:when test="($testsuite = '0' or $testsuite = '1') and 169 (ancestor::sect1[@id='ch-system-coreutils'] or 168 <xsl:when test="(ancestor::sect1[@id='ch-system-coreutils'] or 170 169 ancestor::sect1[@id='ch-system-module-init-tools']) and 171 170 (contains(string(),'check') or 172 contains(string(),'dummy'))"/> 171 contains(string(),'dummy'))"> 172 <xsl:choose> 173 <xsl:when test="$testsuite = '0' or $testsuite = '1'"/> 174 <xsl:otherwise> 175 <xsl:apply-templates/> 176 <xsl:if test="contains(string(),'check')"> 177 <xsl:text> >> $TEST_LOG 2>&1 || true</xsl:text> 178 </xsl:if> 179 <xsl:text>
</xsl:text> 180 </xsl:otherwise> 181 </xsl:choose> 182 </xsl:when> 173 183 <!-- Fixing toolchain test suites run --> 174 184 <xsl:when test="string() = 'make check' or … … 176 186 <xsl:choose> 177 187 <xsl:when test="$testsuite != '0'"> 178 <xsl:text>make -k check || true
</xsl:text>188 <xsl:text>make -k check >> $TEST_LOG 2>&1 || true
</xsl:text> 179 189 </xsl:when> 180 190 </xsl:choose> … … 183 193 <xsl:choose> 184 194 <xsl:when test="$testsuite != '0'"> 185 <xsl:value-of select="substring-before(string(),';')"/> 186 <xsl:text> || true
</xsl:text> 187 <xsl:value-of select="substring-after(string(),';')"/> 188 <xsl:text>
</xsl:text> 195 <xsl:value-of select="substring-before(string(),'>g')"/> 196 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 189 197 </xsl:when> 190 198 </xsl:choose> … … 195 203 <xsl:when test="$testsuite != '0'"> 196 204 <xsl:apply-templates/> 205 <xsl:if test="contains(string(),'test_summary')"> 206 <xsl:text> >> $TEST_LOG</xsl:text> 207 </xsl:if> 197 208 <xsl:text>
</xsl:text> 198 209 </xsl:when> -
CLFS/master.sh
r4fe29a2 re35e794 543 543 FILE="$name-$vrs.tar.*" 544 544 wrt_unpack2 "$FILE" 545 # If the testsuites must be run, initialize the log file 546 case $name in 547 binutils | gcc | glibc ) 548 [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}" 549 ;; 550 * ) 551 [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && wrt_test_log2 "${this_script}" 552 ;; 553 esac 554 # If using optimizations, write the instructions 545 555 [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" 546 556 fi … … 646 656 FILE="$name-$vrs.tar.*" 647 657 wrt_unpack3 "$FILE" 658 # If the testsuites must be run, initialize the log file 659 case $name in 660 binutils | gcc | glibc ) 661 [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}" 662 ;; 663 * ) 664 [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && wrt_test_log2 "${this_script}" 665 ;; 666 esac 667 # If using optimizations, write the instructions 648 668 [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" 649 669 fi -
HLFS/hlfs.xsl
r4fe29a2 re35e794 31 31 32 32 <!-- Time zone --> 33 <xsl:param name="timezone" select=" America/Toronto"/>33 <xsl:param name="timezone" select="GMT"/> 34 34 35 35 <!-- Page size --> … … 37 37 38 38 <!-- Locale settings --> 39 <xsl:param name="lang" select=" en_CA"/>40 <xsl:param name="lc_all" select=" en_CA"/>39 <xsl:param name="lang" select="C"/> 40 <xsl:param name="lc_all" select="C"/> 41 41 42 42 <xsl:template match="/"> … … 145 145 <xsl:choose> 146 146 <xsl:when test="ancestor::sect1[@id='ch-system-gcc']"> 147 <xsl:text>make -k check || true
</xsl:text>147 <xsl:text>make -k check >> $TEST_LOG 2>&1 || true
</xsl:text> 148 148 </xsl:when> 149 149 <xsl:otherwise> … … 151 151 <xsl:text>make -k</xsl:text> 152 152 <xsl:value-of select="substring-after(string(),'make')"/> 153 <xsl:text> || true
</xsl:text>153 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 154 154 </xsl:otherwise> 155 155 </xsl:choose> … … 212 212 </xsl:when> 213 213 <!-- The Coreutils and Module-Init-Tools test suites are optional --> 214 <xsl:when test="($testsuite = '0' or $testsuite = '1') and 215 (ancestor::sect1[@id='ch-system-coreutils'] or 214 <xsl:when test="(ancestor::sect1[@id='ch-system-coreutils'] or 216 215 ancestor::sect1[@id='ch-system-module-init-tools']) and 217 216 (contains(string(),'check') or 218 217 contains(string(),'distclean') or 219 contains(string(),'dummy'))"/> 218 contains(string(),'dummy'))"> 219 <xsl:choose> 220 <xsl:when test="$testsuite = '0' or $testsuite = '1'"/> 221 <xsl:otherwise> 222 <xsl:apply-templates/> 223 <xsl:if test="contains(string(),'check')"> 224 <xsl:text> >> $TEST_LOG 2>&1 || true</xsl:text> 225 </xsl:if> 226 <xsl:text>
</xsl:text> 227 </xsl:otherwise> 228 </xsl:choose> 229 </xsl:when> 220 230 <!-- Fixing toolchain test suites run --> 221 231 <xsl:when test="string() = 'make check' or … … 225 235 ancestor::chapter[@id='chapter-building-system']) or 226 236 $testsuite = '3'"> 227 <xsl:text>make -k check || true</xsl:text> 228 <xsl:text>
</xsl:text> 237 <xsl:text>make -k check >> $TEST_LOG 2>&1 || true
</xsl:text> 229 238 </xsl:when> 230 239 </xsl:choose> … … 235 244 <xsl:when test="$testsuite != '0'"> 236 245 <xsl:value-of select="substring-before(string(),'make check')"/> 237 <xsl:text>make -k check || true
</xsl:text>246 <xsl:text>make -k check >> $TEST_LOG 2>&1 || true
</xsl:text> 238 247 </xsl:when> 239 248 </xsl:choose> -
HLFS/master.sh
r4fe29a2 re35e794 144 144 case $this_script in 145 145 *binutils* ) 146 147 148 146 wrt_unpack "$FILE" 1 ;; # Do not delete an existing package directories 147 *) 148 wrt_unpack "$FILE" ;; 149 149 esac 150 # If the testsuites must be run, initialize the log file 151 [[ "$TEST" = "3" ]] && wrt_test_log "${this_script}" 152 # If using optimizations, write the instructions 150 153 [[ "$OPTIMIZE" = "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" 151 154 fi … … 315 318 wrt_unpack2 "$FILE" 316 319 wrt_target_vars 320 # If the testsuites must be run, initialize the log file 321 case $name in 322 binutils | gcc | glibc ) 323 [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}" 324 ;; 325 * ) 326 [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && wrt_test_log2 "${this_script}" 327 ;; 328 esac 329 # If using optimizations, write the instructions 317 330 [[ "$OPTIMIZE" != "0" ]] && wrt_optimize "$name" && wrt_makeflags "$name" 318 331 fi -
LFS/lfs.xsl
r4fe29a2 re35e794 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
r4fe29a2 re35e794 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 -
common/common-functions
r4fe29a2 re35e794 277 277 cat << EOF 278 278 @\$(call unpack2,$FILE) 279 @ROOT=\`head -n1 \$( SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\279 @ROOT=\`head -n1 \$(MOUNT_PT)\$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\ 280 280 echo "export PKGDIR=\$(SRC)/\$\$ROOT" > envars 281 281 EOF … … 298 298 @ROOT=\`head -n1 \$(SRC)/\$(PKG_LST) | sed 's@^./@@;s@/.*@@'\` && \\ 299 299 echo "export PKGDIR=\$(SRC)/\$\$ROOT" > envars 300 EOF 301 ) >> $MKFILE.tmp 302 } 303 304 #----------------------------------# 305 wrt_test_log() { # Initialize testsuite log file 306 #----------------------------------# 307 local TESTLOGFILE=$1 308 ( 309 cat << EOF 310 @echo "export TEST_LOG=$TESTLOGDIR/$TESTLOGFILE" >> envars && \\ 311 su - lfs -c "echo -e '\n\`date\`\n' >$TESTLOGDIR/$TESTLOGFILE" 312 EOF 313 ) >> $MKFILE.tmp 314 } 315 316 #----------------------------------# 317 wrt_test_log2() { # 318 #----------------------------------# 319 local TESTLOGFILE=$1 320 ( 321 cat << EOF 322 @echo "export TEST_LOG=/$SCRIPT_ROOT/test-logs/$TESTLOGFILE" >> envars && \\ 323 echo -e "\n\`date\`\n" >test-logs/$TESTLOGFILE 300 324 EOF 301 325 ) >> $MKFILE.tmp -
common/config
r4fe29a2 re35e794 90 90 #--- Working directories 91 91 SCRIPT_ROOT=jhalfs 92 JHALFSDIR=$BUILDDIR/$SCRIPT_ROOT 93 LOGDIR=$JHALFSDIR/logs 92 JHALFSDIR=$BUILDDIR/$SCRIPT_ROOT 93 LOGDIR=$JHALFSDIR/logs 94 TESTLOGDIR=$JHALFSDIR/test-logs 94 95 95 96 #--- File listing package contents (from where package sources dir is extracted) -
master.sh
r4fe29a2 re35e794 139 139 JHALFSDIR=$BUILDDIR/${SCRIPT_ROOT} 140 140 LOGDIR=$JHALFSDIR/logs 141 TESTLOGDIR=$JHALFSDIR/test-logs 141 142 MKFILE=$JHALFSDIR/Makefile 142 143 ;; … … 416 417 check_version "3.0" "$BASH_VERSION" "BASH" 417 418 check_version "3.0" "`gcc -dumpversion`" "GCC" 418 tarVer=`tar --version `419 check_version "1.15.0" "${tarVer ##*}" "TAR"419 tarVer=`tar --version | head -n1 | cut -d " " -f4` 420 check_version "1.15.0" "${tarVer}" "TAR" 420 421 echo "${SD_BORDER}${nl_}" 421 422 … … 480 481 >$LOGDIR/$LOG 481 482 # 483 [[ "$TEST" != "0" ]] && [[ ! -d $TESTLOGDIR ]] && install -d -m 1777 $TESTLOGDIR 482 484 # 483 485 if [[ "$PWD" != "$JHALFSDIR" ]]; then 484 486 cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/ 487 # 485 488 [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/ 489 # 486 490 if [[ "$COMPARE" != "0" ]] ; then 487 491 mkdir -p $JHALFSDIR/extras
Note:
See TracChangeset
for help on using the changeset viewer.