Changeset 4c36783

Timestamp:

02/28/2022 01:11:30 PM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

0fa52f2

Parents:

7f25c70

Message:

oRemove legacy: do not run tests in temporary tools (2)

Files:

• LFS/lfs.xsl (modified) (3 diffs)
• jhalfs (modified) (1 diff)

LFS/lfs.xsl

@@ -24 +24 @@
   <!-- Run test suites?
        0 = none
-       1 = only chapter06 critical testsuites
-       2 = all chapter06 testsuites
-       3 = all chapter05 and chapter06 testsuites
+       1 = only chapter08 critical testsuites
+       2 (or more) = all chapter08 testsuites
   -->
   <xsl:param name="testsuite" select="1"/>
@@ -325 +324 @@
         </xsl:otherwise>
       </xsl:choose>
-    </xsl:if>
-    <xsl:if test="$testsuite='3' and
-            ../@id='ch-tools-glibc' and
-            @role='installation'">
-      <xsl:copy-of select="//userinput[@remap='locale-test']"/>
-      <xsl:text>&#xA;</xsl:text>
     </xsl:if>
     <xsl:if test="../@id='ch-system-glibc' and @role='installation'">
@@ -1132 +1125 @@
                           not(ancestor::sect1[@id='ch-system-gmp']) and
                           not(ancestor::sect1[@id='ch-system-mpfr']) and
-                          not(ancestor::sect1[@id='ch-system-binutils']) or
-                      $testsuite = '2' and
-                          ancestor::chapter[@id='chapter-temporary-tools']">
+                          not(ancestor::sect1[@id='ch-system-binutils'])">
           <xsl:text># </xsl:text>
         </xsl:if>

jhalfs

@@ -437 +437 @@
 # But the LFS book is needed for BLFS tools.
   get_book
-# At this point, we should have a way to know whether we have a cross
-# or regular book... In case of cross, prohibite TEST=3
-# the position of gcc-pass2 (chapter 6 or 5) tells us (not valid for
-# cross-chap5 branch).
-  if (( TEST == 3 )) && \
-     [ -f "$BOOK/chapter06/gcc-pass2.xml" ]; then
-        TEST=2
-  fi
   extract_commands
   echo "${SD_BORDER}${nl_}"