From 11cf71c45b1630b28777e6679342b14e78847fb7 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Wed, 16 Jan 2013 18:34:05 +0100
Subject: [PATCH] Revert "run-in-tempdir: Improve speed"
This reverts commit dd60179dfd8 as it broke coverage for Python.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
autotools/run-in-tempdir | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/autotools/run-in-tempdir b/autotools/run-in-tempdir
index 0f4bbe0cb..3c1a79ba5 100755
--- a/autotools/run-in-tempdir
+++ b/autotools/run-in-tempdir
@@ -8,27 +8,19 @@ set -e
tmpdir=$(mktemp -d -t gntbuild.XXXXXXXX)
trap "rm -rf $tmpdir" EXIT
-linkcopy() {
- cp -L -s -r "$@"
-}
-
-dirs=( autotools daemons scripts lib tools qa )
+# fully copy items
+cp -r autotools daemons scripts lib tools qa $tmpdir
if [[ -z "$COPY_DOC" ]]; then
mkdir $tmpdir/doc
ln -s $PWD/doc/examples $tmpdir/doc
else
# Building documentation requires all files
- dirs+=( doc )
+ cp -r doc $tmpdir
fi
-# Create symlinks
-for i in ${dirs[@]}; do
- linkcopy $PWD/$i $tmpdir
-done
-
mkdir $tmpdir/test/
-linkcopy $PWD/test/py $tmpdir/test/py
+cp -r test/py $tmpdir/test/py
ln -s $PWD/test/data $tmpdir/test
ln -s $PWD/test/hs $tmpdir/test
--
GitLab