Changeset 28f4756
- Timestamp:
- 08/05/2006 02:51:11 PM (18 years ago)
- Branches:
- 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk
- Children:
- 963fdae
- Parents:
- 1e69324
- Files:
-
- 6 edited
-
CLFS/clfs.xsl (modified) (6 diffs)
-
HLFS/hlfs.xsl (modified) (5 diffs)
-
LFS/lfs.xsl (modified) (5 diffs)
-
common/common-functions (modified) (4 diffs)
-
common/config (modified) (1 diff)
-
common/func_validate_configs.sh (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
CLFS/clfs.xsl
r1e69324 r28f4756 24 24 1 = only Glibc, GCC and Binutils testsuites 25 25 2 = all testsuites 26 3 = alias to 2 --> 26 3 = alias to 2 27 --> 27 28 <xsl:param name="testsuite" select="1"/> 29 30 <!-- Bomb on test suites failures? 31 0 = no, I want to build the full system and review the logs 32 1 = yes, bomb at the first test suite failure to can review the build dir 33 --> 34 <xsl:param name="bomb-testsuite" select="0"/> 28 35 29 36 <!-- Install vim-lang package? --> … … 118 125 contains(string(),'check')) and 119 126 ($testsuite = '2' or $testsuite = '3')"> 120 <xsl:value-of select="substring-before(string(),'make')"/> 121 <xsl:text>make -k</xsl:text> 122 <xsl:value-of select="substring-after(string(),'make')"/> 123 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 127 <xsl:choose> 128 <xsl:when test="$bomb-testsuite = '0'"> 129 <xsl:value-of select="substring-before(string(),'make')"/> 130 <xsl:text>make -k</xsl:text> 131 <xsl:value-of select="substring-after(string(),'make')"/> 132 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 133 </xsl:when> 134 <xsl:otherwise> 135 <xsl:apply-templates/> 136 <xsl:text> >> $TEST_LOG 2>&1
</xsl:text> 137 </xsl:otherwise> 138 </xsl:choose> 124 139 </xsl:if> 125 140 </xsl:template> … … 173 188 <xsl:when test="$testsuite = '0' or $testsuite = '1'"/> 174 189 <xsl:otherwise> 175 <xsl:apply-templates/> 190 <xsl:if test="not(contains(string(),'check'))"> 191 <xsl:apply-templates/> 192 <xsl:text>
</xsl:text> 193 </xsl:if> 176 194 <xsl:if test="contains(string(),'check')"> 177 <xsl:text> >> $TEST_LOG 2>&1 || true</xsl:text> 195 <xsl:choose> 196 <xsl:when test="$bomb-testsuite = '0'"> 197 <xsl:value-of select="substring-before(string(),'check')"/> 198 <xsl:text>-k check</xsl:text> 199 <xsl:value-of select="substring-after(string(),'check')"/> 200 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 201 </xsl:when> 202 <xsl:otherwise> 203 <xsl:apply-templates/> 204 <xsl:text> >> $TEST_LOG 2>&1
</xsl:text> 205 </xsl:otherwise> 206 </xsl:choose> 178 207 </xsl:if> 179 <xsl:text>
</xsl:text>180 208 </xsl:otherwise> 181 209 </xsl:choose> … … 186 214 <xsl:choose> 187 215 <xsl:when test="$testsuite != '0'"> 188 <xsl:text>make -k check >> $TEST_LOG 2>&1 || true
</xsl:text> 216 <xsl:choose> 217 <xsl:when test="$bomb-testsuite = '0'"> 218 <xsl:text>make -k check >> $TEST_LOG 2>&1 || true
</xsl:text> 219 </xsl:when> 220 <xsl:otherwise> 221 <xsl:apply-templates/> 222 <xsl:text> >> $TEST_LOG 2>&1
</xsl:text> 223 </xsl:otherwise> 224 </xsl:choose> 189 225 </xsl:when> 190 226 </xsl:choose> … … 194 230 <xsl:when test="$testsuite != '0'"> 195 231 <xsl:value-of select="substring-before(string(),'>g')"/> 196 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 232 <xsl:choose> 233 <xsl:when test="$bomb-testsuite = '0'"> 234 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 235 </xsl:when> 236 <xsl:otherwise> 237 <xsl:text>>> $TEST_LOG 2>&1
</xsl:text> 238 </xsl:otherwise> 239 </xsl:choose> 197 240 </xsl:when> 198 241 </xsl:choose> … … 203 246 <xsl:when test="$testsuite != '0'"> 204 247 <xsl:apply-templates/> 205 <xsl:if test="contains(string(),'test_summary')"> 206 <xsl:text> >> $TEST_LOG</xsl:text> 207 </xsl:if> 208 <xsl:text>
</xsl:text> 248 <xsl:text> >> $TEST_LOG
</xsl:text> 209 249 </xsl:when> 210 250 </xsl:choose> -
HLFS/hlfs.xsl
r1e69324 r28f4756 27 27 1 = only chapter06 Glibc, GCC and Binutils testsuites 28 28 2 = all chapter06 testsuites 29 3 = alias to 2 --> 29 3 = alias to 2 30 --> 30 31 <xsl:param name="testsuite" select="1"/> 32 33 <!-- Bomb on test suites failures? 34 0 = no, I want to build the full system and review the logs 35 1 = yes, bomb at the first test suite failure to can review the build dir 36 --> 37 <xsl:param name="bomb-testsuite" select="0"/> 31 38 32 39 <!-- Time zone --> … … 136 143 contains(string(),'check')) and 137 144 ($testsuite = '2' or $testsuite = '3')"> 138 <xsl:value-of select="substring-before(string(),'make')"/> 139 <xsl:text>make -k</xsl:text> 140 <xsl:value-of select="substring-after(string(),'make')"/> 141 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 145 <xsl:choose> 146 <xsl:when test="$bomb-testsuite = '0'"> 147 <xsl:value-of select="substring-before(string(),'make')"/> 148 <xsl:text>make -k</xsl:text> 149 <xsl:value-of select="substring-after(string(),'make')"/> 150 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 151 </xsl:when> 152 <xsl:otherwise> 153 <xsl:apply-templates/> 154 <xsl:text> >> $TEST_LOG 2>&1
</xsl:text> 155 </xsl:otherwise> 156 </xsl:choose> 142 157 </xsl:if> 143 158 </xsl:template> … … 206 221 <xsl:when test="$testsuite = '0' or $testsuite = '1'"/> 207 222 <xsl:otherwise> 208 <xsl:apply-templates/> 223 <xsl:if test="not(contains(string(),'check'))"> 224 <xsl:apply-templates/> 225 <xsl:text>
</xsl:text> 226 </xsl:if> 209 227 <xsl:if test="contains(string(),'check')"> 210 <xsl:text> >> $TEST_LOG 2>&1 || true</xsl:text> 228 <xsl:choose> 229 <xsl:when test="$bomb-testsuite = '0'"> 230 <xsl:value-of select="substring-before(string(),'check')"/> 231 <xsl:text>-k check</xsl:text> 232 <xsl:value-of select="substring-after(string(),'check')"/> 233 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 234 </xsl:when> 235 <xsl:otherwise> 236 <xsl:apply-templates/> 237 <xsl:text> >> $TEST_LOG 2>&1
</xsl:text> 238 </xsl:otherwise> 239 </xsl:choose> 211 240 </xsl:if> 212 <xsl:text>
</xsl:text>213 241 </xsl:otherwise> 214 242 </xsl:choose> … … 218 246 <xsl:choose> 219 247 <xsl:when test="$testsuite != '0'"> 220 <xsl:text>make -k check >> $TEST_LOG 2>&1 || true
</xsl:text> 248 <xsl:apply-templates/> 249 <xsl:choose> 250 <xsl:when test="$bomb-testsuite = '0'"> 251 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 252 </xsl:when> 253 <xsl:otherwise> 254 <xsl:text> >> $TEST_LOG 2>&1
</xsl:text> 255 </xsl:otherwise> 256 </xsl:choose> 221 257 </xsl:when> 222 258 </xsl:choose> … … 227 263 <xsl:when test="$testsuite != '0'"> 228 264 <xsl:value-of select="substring-before(string(),'> glibc-')"/> 229 <xsl:text>>> $TEST_LOG 2>&1 || true
</xsl:text> 265 <xsl:choose> 266 <xsl:when test="$bomb-testsuite = '0'"> 267 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 268 </xsl:when> 269 <xsl:otherwise> 270 <xsl:text> >> $TEST_LOG 2>&1
</xsl:text> 271 </xsl:otherwise> 272 </xsl:choose> 230 273 </xsl:when> 231 274 </xsl:choose> -
LFS/lfs.xsl
r1e69324 r28f4756 18 18 1 = only chapter06 Glibc, GCC and Binutils testsuites 19 19 2 = all chapter06 testsuites 20 3 = all chapter05 and chapter06 testsuites--> 20 3 = all chapter05 and chapter06 testsuites 21 --> 21 22 <xsl:param name="testsuite" select="1"/> 23 24 <!-- Bomb on test suites failures? 25 0 = no, I want to build the full system and review the logs 26 1 = yes, bomb at the first test suite failure to can review the build dir 27 --> 28 <xsl:param name="bomb-testsuite" select="0"/> 22 29 23 30 <!-- Install vim-lang package? --> … … 110 117 ancestor::chapter[@id='chapter-building-system']) or 111 118 $testsuite = '3')"> 112 <xsl:value-of select="substring-before(string(),'make')"/> 113 <xsl:text>make -k</xsl:text> 114 <xsl:value-of select="substring-after(string(),'make')"/> 115 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 119 <xsl:choose> 120 <xsl:when test="$bomb-testsuite = '0'"> 121 <xsl:value-of select="substring-before(string(),'make')"/> 122 <xsl:text>make -k</xsl:text> 123 <xsl:value-of select="substring-after(string(),'make')"/> 124 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 125 </xsl:when> 126 <xsl:otherwise> 127 <xsl:apply-templates/> 128 <xsl:text> >> $TEST_LOG 2>&1
</xsl:text> 129 </xsl:otherwise> 130 </xsl:choose> 116 131 </xsl:if> 117 132 </xsl:template> … … 161 176 <xsl:when test="$testsuite = '0' or $testsuite = '1'"/> 162 177 <xsl:otherwise> 163 <xsl:apply-templates/> 178 <xsl:if test="not(contains(string(),'check'))"> 179 <xsl:apply-templates/> 180 <xsl:text>
</xsl:text> 181 </xsl:if> 164 182 <xsl:if test="contains(string(),'check')"> 165 <xsl:text> >> $TEST_LOG 2>&1 || true</xsl:text> 183 <xsl:choose> 184 <xsl:when test="$bomb-testsuite = '0'"> 185 <xsl:value-of select="substring-before(string(),'check')"/> 186 <xsl:text>-k check</xsl:text> 187 <xsl:value-of select="substring-after(string(),'check')"/> 188 <xsl:text> >> $TEST_LOG 2>&1 || true
</xsl:text> 189 </xsl:when> 190 <xsl:otherwise> 191 <xsl:apply-templates/> 192 <xsl:text> >> $TEST_LOG 2>&1
</xsl:text> 193 </xsl:otherwise> 194 </xsl:choose> 166 195 </xsl:if> 167 <xsl:text>
</xsl:text>168 196 </xsl:otherwise> 169 197 </xsl:choose> … … 176 204 ancestor::chapter[@id='chapter-building-system']) or 177 205 $testsuite = '3'"> 178 <xsl:text>make -k check >> $TEST_LOG 2>&1 || true
</xsl:text> 206 <xsl:choose> 207 <xsl:when test="$bomb-testsuite = '0'"> 208 <xsl:text>make -k check >> $TEST_LOG 2>&1 || true
</xsl:text> 209 </xsl:when> 210 <xsl:otherwise> 211 <xsl:apply-templates/> 212 <xsl:text> >> $TEST_LOG 2>&1
</xsl:text> 213 </xsl:otherwise> 214 </xsl:choose> 179 215 </xsl:when> 180 216 </xsl:choose> … … 195 231 $testsuite = '3'"> 196 232 <xsl:apply-templates/> 197 <xsl:if test="contains(string(),'test_summary')"> 198 <xsl:text> >> $TEST_LOG</xsl:text> 199 </xsl:if> 200 <xsl:text>
</xsl:text> 233 <xsl:text> >> $TEST_LOG
</xsl:text> 201 234 </xsl:when> 202 235 </xsl:choose> -
common/common-functions
r1e69324 r28f4756 728 728 --stringparam method $METHOD \ 729 729 --stringparam testsuite $TEST \ 730 --stringparam bomb-testsuite $BOMB_TEST \ 730 731 --stringparam vim-lang $VIMLANG \ 731 732 --stringparam timezone $TIMEZONE \ … … 741 742 --xinclude \ 742 743 --stringparam testsuite $TEST \ 744 --stringparam bomb-testsuite $BOMB_TEST \ 743 745 --stringparam vim-lang $VIMLANG \ 744 746 --stringparam timezone $TIMEZONE \ … … 754 756 --stringparam model $MODEL \ 755 757 --stringparam testsuite $TEST \ 758 --stringparam bomb-testsuite $BOMB_TEST \ 756 759 --stringparam timezone $TIMEZONE \ 757 760 --stringparam page $PAGE \ … … 767 770 --xinclude \ 768 771 --stringparam testsuite $TEST \ 772 --stringparam bomb-testsuite $BOMB_TEST \ 769 773 --stringparam vim-lang $VIMLANG \ 770 774 --stringparam timezone $TIMEZONE \ -
common/config
r1e69324 r28f4756 52 52 TEST=1 53 53 54 #--- Bomb on test suites failures? 55 # 0 = no, I want to build the full system and review the logs 56 # 1 = yes, bomb at the first test suite failure to can review the build dir 57 BOMB_TEST=0 58 54 59 #--- Run the stripping phases 0(no)/1(yes) 55 60 STRIP=1 -
common/func_validate_configs.sh
r1e69324 r28f4756 87 87 88 88 # First internal variables, then the ones that change the book's flavour, and lastly system configuration variables 89 local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP PAGE TIMEZONE LANG LC_ALL"90 local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"91 local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG"92 local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG"89 local -r hlfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE MODEL GRSECURITY_HOST TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP PAGE TIMEZONE LANG LC_ALL" 90 local -r clfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE METHOD ARCH TARGET TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB BOOT_CONFIG CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG" 91 local -r clfs2_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE ARCH TARGET OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL KEYMAP VIMLANG PAGE TIMEZONE LANG" 92 local -r lfs_PARAM_LIST="BOOK BUILDDIR SRC_ARCHIVE GETPKG RUNMAKE TEST BOMB_TEST OPTIMIZE REPORT COMPARE RUN_ICA RUN_FARCE ITERATIONS STRIP FSTAB CONFIG GETKERNEL VIMLANG PAGE TIMEZONE LANG" 93 93 94 94 local -r ERROR_MSG_pt1='The variable \"${L_arrow}${config_param}${R_arrow}\" value ${L_arrow}${BOLD}${!config_param}${R_arrow} is invalid,' … … 206 206 ITERATIONS) [[ "$COMPARE" = "1" ]] && validate_against_str "x2x x3x x4x x5x" ;; 207 207 TEST) validate_against_str "x0x x1x x2x x3x" ;; 208 BOMB_TEST) [[ ! "$TEST" = "0" ]] && validate_against_str "x0x x1x" ;; 208 209 OPTIMIZE) validate_against_str "x0x x1x x2x" ;; 209 210 STRIP) validate_against_str "x0x x1x" ;;
Note:
See TracChangeset
for help on using the changeset viewer.
