Re: Test t9500 fails if Time::HiRes is missing
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Jan 23, 2012, 09:42 UTC
- Message-ID
- <CACBZZX4cjcY5d3mPJAV+rbSTqCEUOrF=_dd3ny_jSM++G-Bg1Q@mail.gmail.com>
- In-Reply-To
- <hbf.20120123rqzg@bombur.uio.no>
On Mon, Jan 23, 2012 at 05:50, Hallvard Breien Furuseth <h.b.furuseth@usit.uio.no> wrote:
Show 20 quoted lines
> t9500-gitweb-standalone-no-errors fails: Git 1.7.9.rc2/1.7.8.4, RHEL
> 6.2, Perl 5.10.1. Reverting 3962f1d756ab41c1d180e35483d1c8dffe51e0d1
> fixes it. The commit expects Time::HiRes to be present, but RedHat
> has split it out to a separate RPM perl-Time-HiRes. Better add a
> comment about that, so it doesn't get re-reverted.
>
> Or pacify the test and expect gitweb@RHEL-users to install the RPM:
>
> --- git-1.7.9.rc2/t/gitweb-lib.sh~
> +++ git-1.7.9.rc2/t/gitweb-lib.sh
> @@ -113,4 +113,9 @@
> test_done
> }
>
> +perl -MTime::HiRes -e 0 >/dev/null 2>&1 || {
> + skip_all='skipping gitweb tests, Time::HiRes module not available'
> + test_done
> +}
> +
> gitweb_init[Adding Jakub to CC]
This doesn't actually fix the issue, it only sweeps it under the rug by making the tests pass, gitweb will still fail to compile on Red Hat once installed.
I think the right solution is to partially revert 3962f1d756ab41c1d180e35483d1c8dffe51e0d1, but add a comment in the code indicating that it's to deal with RedHat's broken fork of Perl.
However even if it's required in an eval it might still fail at runtime in the reset_timer() function, which'll need to deal with it too.