On Tue, Mar 13, 2012 at 17:12, Iustin Pop <ius...@google.com> wrote:
> On Tue, Mar 13, 2012 at 10:26:55AM +0100, René Nussbaumer wrote:
>> On Mon, Mar 12, 2012 at 10:29, Iustin Pop <ius...@google.com> wrote:
>> > This allows the offline tests to also generate coverage data, and the
>> > hs-coverage target is changed to show both unit-test and offline-tests
>> > coverage.
>> >
>> > The downside is that now we build yet-another-binary, which makes the
>> > unit-test time slower…
>> > ---
>> >  .gitignore               |    2 ++
>> >  Makefile.am              |   20 ++++++++++++--------
>> >  htools/cli-tests-defs.sh |    2 +-
>> >  htools/htools-hpc.hs     |    1 +
>> >  4 files changed, 16 insertions(+), 9 deletions(-)
>> >  create mode 120000 htools/htools-hpc.hs
>>
>> LGTM.
>
> Thanks. I saw this actually breaks when running tests via "make check"
> (as opposed to make hs-coverage, or directly calling the tests), so I've
> submitted with this one-line change:
>
> diff --git a/autotools/run-in-tempdir b/autotools/run-in-tempdir
> index e4f9df2..b9be390 100755
> --- a/autotools/run-in-tempdir
> +++ b/autotools/run-in-tempdir
> @@ -12,7 +12,7 @@ cp -r autotools daemons scripts lib tools test $tmpdir
>  mv $tmpdir/lib $tmpdir/ganeti
>  ln -T -s $tmpdir/ganeti $tmpdir/lib
>  mkdir -p $tmpdir/htools
> -for htest in htools test offline-test.sh cli-tests-defs.sh; do
> +for htest in htools htools-hpc test offline-test.sh cli-tests-defs.sh; do
>   if [ -e htools/$htest ]; then
>     cp -p htools/$htest $tmpdir/htools/
>   fi
>
> Let me know if this is not OK and I'll revert…

LOKTM ;)

René

Reply via email to