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

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

Browse source
This commit is contained in:
Pierre Labastie 2022-02-28 14:11:30 +01:00
parent 7f25c704ed
commit 4c36783ec4
2 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
LFS/lfs.xsl
View file

@ -23,9 +23,8 @@
<!-- Run test suites? <!-- Run test suites?
0 = none 0 = none
1 = only chapter06 critical testsuites 1 = only chapter08 critical testsuites
2 = all chapter06 testsuites 2 (or more) = all chapter08 testsuites
3 = all chapter05 and chapter06 testsuites
--> -->
<xsl:param name="testsuite" select="1"/> <xsl:param name="testsuite" select="1"/>
@ -325,12 +324,6 @@ rm -rf $PKG_DEST
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:if> </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'"> <xsl:if test="../@id='ch-system-glibc' and @role='installation'">
<xsl:choose> <xsl:choose>
<xsl:when test="$full-locale='y'"> <xsl:when test="$full-locale='y'">
@ -1131,9 +1124,7 @@ LOGLEVEL="</xsl:text>
not(ancestor::sect1[@id='ch-system-glibc']) and not(ancestor::sect1[@id='ch-system-glibc']) and
not(ancestor::sect1[@id='ch-system-gmp']) and not(ancestor::sect1[@id='ch-system-gmp']) and
not(ancestor::sect1[@id='ch-system-mpfr']) and not(ancestor::sect1[@id='ch-system-mpfr']) and
not(ancestor::sect1[@id='ch-system-binutils']) or not(ancestor::sect1[@id='ch-system-binutils'])">
$testsuite = '2' and
ancestor::chapter[@id='chapter-temporary-tools']">
<xsl:text># </xsl:text> <xsl:text># </xsl:text>
</xsl:if> </xsl:if>
<xsl:choose> <xsl:choose>

8
jhalfs
View file

@ -436,14 +436,6 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then
# Note that all customization to $JHALFSDIR have to be done before this. # Note that all customization to $JHALFSDIR have to be done before this.
# But the LFS book is needed for BLFS tools. # But the LFS book is needed for BLFS tools.
get_book 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 extract_commands
echo "${SD_BORDER}${nl_}" echo "${SD_BORDER}${nl_}"
cd "$CWD" # the functions above change directory cd "$CWD" # the functions above change directory