From 57ca090154a95f3936cf70777cd1162ee4374a60 Mon Sep 17 00:00:00 2001
From: Manuel Canales Esparcia <manuel@linuxfromscratch.org>
Date: Thu, 16 Mar 2006 21:25:25 +0000
Subject: [PATCH] Download also gcc-testsuite package if the testsuite must be
 run. Trailing space cleanup.

---
 HLFS/master.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/HLFS/master.sh b/HLFS/master.sh
index 60788b4..fef3dce 100755
--- a/HLFS/master.sh
+++ b/HLFS/master.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 set -e  # Enable error trapping
 
+# $Id$
 
 ###################################
 ###          FUNCTIONS          ###
@@ -61,6 +62,9 @@ get_sources() {              #
 
       "gcc" )   download $PKG "gcc-core-$VRS.tar.bz2"
                 download $PKG "gcc-g++-$VRS.tar.bz2"
+                if [ ! "$TEST" = "0" ] ; then
+                  download $PKG "gcc-testsuite-$VRS.tar.bz2" ;
+                fi
         ;;
       "glibc")  download $PKG "$PKG-$VRS.tar.bz2"
                 download $PKG "$PKG-libidn-$VRS.tar.bz2"
@@ -94,7 +98,7 @@ chapter4_Makefiles() {       # Initialization of the system
 #----------------------------#
   local TARGET LOADER
 
-  echo  "${YELLOW}  Processing Chapter-4 scripts ${OFF}"
+  echo  "${YELLOW}  Processing Chapter-3 scripts ${OFF}"
 
   # Define a few model dependant variables
   if [[ ${MODEL} = "uclibc" ]]; then
@@ -164,7 +168,7 @@ chapter5_Makefiles() {       # Bootstrap or temptools phase
 #----------------------------#
   local file
   local this_script
-  
+
   echo "${YELLOW}  Processing Chapter-5 scripts${OFF}"
 
   for file in chapter05/* ; do
@@ -328,13 +332,13 @@ chapter6_Makefiles() {       # sysroot or chroot build phase
     # Sed replacement for 'nodump' tag in xml scripts until Manuel has a chance to fix them
     #
     case $name in
-      kernfs) 
+      kernfs)
             # We are using LFS instead of HLFS..
           sed 's/HLFS/LFS/' -i chapter06/$this_script
             # Remove sysctl code if host does not have grsecurity enabled
           if [[ "$GRSECURITY_HOST" = "0" ]]; then
             sed '/sysctl/d' -i chapter06/$this_script
-          fi 
+          fi
         ;;
       module-init-tools)
           if [[ "$TEST" = "0" ]]; then  # This needs rework....
@@ -436,7 +440,7 @@ chapter7_Makefiles() {       # Create a bootable system.. kernel, bootscripts..e
 #----------------------------#
   local file
   local this_script
-  
+
   echo  "${YELLOW}  Processing Chapter-7 scripts ${OFF}"
   for file in chapter07/*; do
     # Keep the script file name
@@ -451,7 +455,7 @@ chapter7_Makefiles() {       # Create a bootable system.. kernel, bootscripts..e
       *reboot)  continue  ;;
       *console) continue  ;; # Use the file generated by lfs-bootscripts
 
-      *kernel)  
+      *kernel)
           # If no .config file is supplied, the kernel build is skipped
         [[ -z $CONFIG ]] && continue
 	  # How does Manuel add this string to the file..