From dbd5e50583752baccb59d981c2e434d3e518f762 Mon Sep 17 00:00:00 2001
From: "Yann E. MORIN\"" <yann.morin.1998@anciens.enib.fr>
Date: Sat, 22 May 2010 22:04:31 +0200
Subject: test-suite: apply cleanup pass

Remove all non-modifiable items (target tuple, gcc version, toolchain path...)
Makefile syntax ( use $(...) instead of ${...} )
Update doc
Space-damage cleanups
---
 scripts/build/test_suite/gcc.sh | 26 ++++++++++----------------
 scripts/crosstool-NG.sh.in      |  2 +-
 2 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'scripts')

diff --git a/scripts/build/test_suite/gcc.sh b/scripts/build/test_suite/gcc.sh
index 1b652691..c2493c05 100644
--- a/scripts/build/test_suite/gcc.sh
+++ b/scripts/build/test_suite/gcc.sh
@@ -14,22 +14,16 @@ do_test_suite_gcc_build() {
  
     CT_DoStep INFO "Installing GCC test suite"
 
-    CT_DoExecLog ALL mkdir -p "${CT_TEST_SUITE_DIR}/gcc-test-suite/gcc-${CT_CC_VERSION}/gcc"
-    CT_DoExecLog ALL cp "${CT_TOP_DIR}/contrib/gcc-test-suite/Makefile" \
-                        "${CT_TEST_SUITE_DIR}/gcc-test-suite"
-    CT_DoExecLog ALL cp "${CT_TOP_DIR}/contrib/gcc-test-suite/default.cfg" \
-                        "${CT_TEST_SUITE_DIR}/gcc-test-suite"
-    CT_DoExecLog ALL cp "${CT_TOP_DIR}/contrib/gcc-test-suite/README" \
-                        "${CT_TEST_SUITE_DIR}/gcc-test-suite"
-    CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/testsuite" \
-                           "${CT_TEST_SUITE_DIR}/gcc-test-suite/gcc-${CT_CC_VERSION}/gcc"
-    sed "s/DG_GCC_VERSION .*/DG_GCC_VERSION = ${CT_CC_VERSION}/g" \
-        ${CT_TEST_SUITE_DIR}/gcc-test-suite/default.cfg > \
-        ${CT_TEST_SUITE_DIR}/gcc-test-suite/default.cfg.tmp
-    sed "s/DG_TARGET .*/DG_TARGET = ${CT_TARGET}/g" \
-        ${CT_TEST_SUITE_DIR}/gcc-test-suite/default.cfg.tmp > \
-        ${CT_TEST_SUITE_DIR}/gcc-test-suite/default.cfg
-    CT_DoExecLog ALL rm -f "${CT_TEST_SUITE_DIR}/gcc-test-suite/default.cfg.tmp"
+    CT_DoExecLog ALL mkdir -p "${CT_TEST_SUITE_DIR}/gcc"
+    CT_DoExecLog ALL cp -a "${CT_LIB_DIR}/contrib/gcc-test-suite/default.cfg"               \
+                           "${CT_LIB_DIR}/contrib/gcc-test-suite/Makefile"                  \
+                           "${CT_LIB_DIR}/contrib/gcc-test-suite/README"                    \
+                           "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/testsuite"               \
+                           "${CT_TEST_SUITE_DIR}/gcc"
+
+    CT_DoExecLog ALL sed -i -r -e "s/@@DG_TARGET@@/${CT_TARGET}/g;"     \
+                         "${CT_TEST_SUITE_DIR}/gcc/Makefile"
+
     CT_EndStep
 }
 
diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index 29ae4a15..45386de0 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -602,6 +602,6 @@ exec >/dev/null 2>&1
 
 [ "${CT_LOG_FILE_COMPRESS}" = y ] && bzip2 -9 "${CT_LOG_FILE}"
 [ "${CT_INSTALL_DIR_RO}" = "y"  ] && chmod -R a-w "${CT_INSTALL_DIR}"
-[ "${CT_TEST_SUITE}" = "y" ] && chmod -R a+w "${CT_TEST_SUITE_DIR}"
+[ "${CT_TEST_SUITE}" = "y" ] && chmod -R u+w "${CT_TEST_SUITE_DIR}"
 
 trap - EXIT
-- 
cgit v1.2.3