zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove legacy: remove tests in temporary tools

Browse source 
There is no way to run them now since we are in a cross build
configuration
This commit is contained in:
Pierre Labastie 2022-02-28 13:45:00 +01:00
parent e3f41e33d5
commit 9d665db456
2 changed files with 1 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Config.in
View file

@ -198,10 +198,6 @@ menu "BOOK Settings"
bool "lynx (optional, for reading the generated book)" bool "lynx (optional, for reading the generated book)"
default y default y
config DEP_SUDO
bool "sudo (recommended)"
default y
config DEP_WGET config DEP_WGET
bool "wget (recommended)" bool "wget (recommended)"
default y default y
@ -480,7 +476,6 @@ depends on !BOOK_BLFS
# You will have to select between: # You will have to select between:
# - Only critical final system testsuites # - Only critical final system testsuites
# - All final system testsuites # - All final system testsuites
# - Both temporary tools and final system testsuites
# You will be prompted also about the "flavour" of the # You will be prompted also about the "flavour" of the
# testsuites run: # testsuites run:
# - Don't stop on test suite failures # - Don't stop on test suite failures
@ -512,12 +507,6 @@ depends on !BOOK_BLFS
# Test instructions for the temporary tools (if available) # Test instructions for the temporary tools (if available)
# are commented out. # 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 endchoice
choice choice
@ -537,7 +526,6 @@ depends on !BOOK_BLFS
default "0" if !CONFIG_TESTS default "0" if !CONFIG_TESTS
default "1" if TST_1 default "1" if TST_1
default "2" if TST_2 default "2" if TST_2
default "3" if TST_3
config BOMB_TEST config BOMB_TEST
bool bool
@ -889,8 +877,6 @@ depends on !BOOK_BLFS
config OPT_2 config OPT_2
bool "Both temp tools and final system" bool "Both temp tools and final system"
config OPT_3
bool "Cross tools (only MAKEFLAGS), temp tools and final system" if BOOK_CLFS
endchoice endchoice
config REALSBU config REALSBU
@ -901,14 +887,12 @@ depends on !BOOK_BLFS
#-- Use -j1 in make invokation for Binutils pass1 to #-- Use -j1 in make invokation for Binutils pass1 to
# get a valid SBU value. # get a valid SBU value.
endmenu endmenu # Optimization settings
config OPTIMIZE config OPTIMIZE
int int
default "0" if !CONFIG_OPTIMIZE default "0" if !CONFIG_OPTIMIZE
default "1" if OPT_1 default "1" if OPT_1
default "2" if OPT_2 default "2" if OPT_2
default "3" if OPT_3
endif
#--- End Optimizations #--- End Optimizations

3
LFS/master.sh
View file

@ -46,7 +46,6 @@ chapter_targets() { #
this_script=`basename $file` this_script=`basename $file`
# Some scripts need peculiar actions: # 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 # - 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 # correct commands if the user does not want to strip, so skip it
# in this case # in this case
@ -54,8 +53,6 @@ chapter_targets() { #
# - grub config: must be done manually; skip it # - grub config: must be done manually; skip it
# - handle fstab and .config. Skip kernel if .config not supplied # - handle fstab and .config. Skip kernel if .config not supplied
case "${this_script}" in case "${this_script}" in
5*glibc) [[ "${TEST}" = "3" ]] && \
sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;;
*strippingagain) [[ "${STRIP}" = "n" ]] && continue ;; *strippingagain) [[ "${STRIP}" = "n" ]] && continue ;;
*stripping) [[ "${STRIP}" = "n" ]] && continue ;; *stripping) [[ "${STRIP}" = "n" ]] && continue ;;
*linux-headers*) [[ -n "$N" ]] && continue ;; *linux-headers*) [[ -n "$N" ]] && continue ;;