Changeset 9d665db

Timestamp:

02/28/2022 12:45:00 PM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

ablfs-more, trunk

Children:

7f25c70

Parents:

e3f41e33

Message:

Remove legacy: remove tests in temporary tools

There is no way to run them now since we are in a cross build
configuration

Files:

• Config.in (modified) (7 diffs)
• LFS/master.sh (modified) (2 diffs)

Config.in

@@ -197 +197 @@
             config    DEP_LYNX
             bool    "lynx (optional, for reading the generated book)"
-            default    y
-
-            config    DEP_SUDO
-            bool    "sudo (recommended)"
             default    y
 
@@ -481 +477 @@
             #  - Only critical final system testsuites
             #  - All final system testsuites
-            #  - Both temporary tools and final system testsuites
             #  You will be prompted also about the "flavour" of the
             #  testsuites run:
@@ -513 +508 @@
                 # are commented out.
 
-        config    TST_3
-            bool    "All testsuites" if !BOOK_HLFS && !BOOK_CLFS
-            help
-                #-- All tests:
-                # Runs all the testsuites for both temporary tools (if
-                # available) and final system
     endchoice
 
@@ -538 +527 @@
         default    "1"    if TST_1
         default    "2"    if TST_2
-        default    "3"    if TST_3
 
     config    BOMB_TEST
@@ -890 +878 @@
             bool    "Both temp tools and final system"
 
-        config    OPT_3
-            bool    "Cross tools (only MAKEFLAGS), temp tools and final system" if BOOK_CLFS
     endchoice
 
@@ -902 +888 @@
            #   get a valid SBU value.
 
-endmenu
+    endmenu # Optimization settings
     config    OPTIMIZE
         int
@@ -908 +894 @@
         default    "1"    if OPT_1
         default    "2"    if OPT_2
-        default    "3"    if OPT_3
-endif
 
     #--- End Optimizations

LFS/master.sh

@@ -47 +47 @@
 
     # Some scripts need peculiar actions:
-    # - glibc chap 5: fix locales creation when running chapter05 testsuites
     # - Stripping at the end of system build: lfs.xsl does not generate
     #   correct commands if the user does not want to strip, so skip it
@@ -55 +54 @@
     # - handle fstab and .config. Skip kernel if .config not supplied
     case "${this_script}" in
-      5*glibc)         [[ "${TEST}" = "3" ]] && \
-                       sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;;
       *strippingagain) [[ "${STRIP}" = "n" ]] && continue ;;
       *stripping)      [[ "${STRIP}" = "n" ]] && continue ;;