Commit 75b32fff authored by Iustin Pop's avatar Iustin Pop
Browse files

Optimise autotools/run-in-tempdir



I made a mistake when adding support for htools to run-in-tempdir, by
needlessly copying the htools binaries, when it's enough to link
them. The copying is only really needed for python code, so we change
the Haskell binaries to linking and also a few other directories.

Difference:
- before: 0.8s, 95MB copied
- after: 0.6s, 6.2MB copied

And, by the way, can't wait for Python 2.6 as minimum supported
version…
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent acaf3ca7
......@@ -11,7 +11,7 @@ trap "rm -rf $tmpdir" EXIT
mkdir $tmpdir/doc
cp -r autotools daemons scripts lib tools test qa $tmpdir
cp -r doc/examples $tmpdir/doc
ln -s $PWD/doc/examples $tmpdir/doc
mv $tmpdir/lib $tmpdir/ganeti
ln -T -s $tmpdir/ganeti $tmpdir/lib
......@@ -19,14 +19,14 @@ ln -T -s $tmpdir/ganeti $tmpdir/lib
mkdir -p $tmpdir/htools $tmpdir/htest
for hfile in htools ganeti-confd mon-collector; do
if [ -e htools/$hfile ]; then
cp -p htools/$hfile $tmpdir/htools/
ln -s $PWD/htools/$hfile $tmpdir/htools/
fi
done
for hfile in hpc-htools test offline-test.sh cli-tests-defs.sh \
hbal hscan hspace hinfo hcheck hail hroller hpc-mon-collector; do
if [ -e htest/$hfile ]; then
cp -p htest/$hfile $tmpdir/htest/
ln -s $PWD/htest/$hfile $tmpdir/htest/
fi
done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment