Changeset 7613d3c

Timestamp:

08/01/2006 07:28:45 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

e0b032b

Parents:

8715be1

Message:

Merged r2867 from experimental branch.

File:

• HLFS/master.sh (modified) (3 diffs)

HLFS/master.sh

@@ -248 +248 @@
       # Insert instructions for unpacking the package and to set the PKGDIR variable.
       wrt_Unpack_SetOwner "hlfs" "$pkg_tarball"
-      # If the testsuites must be run, initialize the log file
-      [[ "$TEST" = "3" ]] && wrt_test_log "${this_script}"
       # If using optimizations, write the instructions
       [[ "$OPTIMIZE" = "2" ]] &&  wrt_optimize "$name" && wrt_makeflags "$name"
@@ -354 +352 @@
     # as a dependency. Also call the echo_message function.
     if [[ ${name} = "butterfly-toolchain" ]]; then
-       wrt_target "$this_script" "$PREV"
+       wrt_target "${this_script}${N}" "$PREV"
          process_toolchain "${this_script}" "${file}"
        wrt_touch
@@ -368 +366 @@
       wrt_unpack2 "$pkg_tarball"
       # If the testsuites must be run, initialize the log file
+      # butterfly-toolchain tests are enabled in 'process_tookchain' function
       case $name in
-        glibc )
-          [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
+        glibc ) [[ "$TEST" != "0" ]] && wrt_test_log2 "${this_script}"
           ;;
-        * )
-          [[ "$TEST" = "2" ]] || [[ "$TEST" = "3" ]] && wrt_test_log2 "${this_script}"
+            * ) [[ "$TEST"  = "2" ]] && wrt_test_log2 "${this_script}"
           ;;
       esac