diff --git a/ChangeLog b/ChangeLog index 9ba522dd..3f89b44e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-01-14 Peter Rosin + + Fix flakey mdemo-dryrun test on MSYS (again!) + * tests/mdemo-dryrun.test: ls -l in MSYS sometimes shows year, + not time, for really fresh files. Add sleep 1 call at yet another + strategic position. Makes the test pass reliably for MSYS/MinGW. + 2008-12-19 Akim Demaille Fix copyright notice. diff --git a/tests/mdemo-dryrun.test b/tests/mdemo-dryrun.test index 8bef7bc5..678891de 100755 --- a/tests/mdemo-dryrun.test +++ b/tests/mdemo-dryrun.test @@ -99,6 +99,8 @@ func_make install func_msg "Running $MAKE uninstall in ../mdemo (dry run)" # Libtool does not uninstall the programs, remove them first rm -f "$prefix/bin/mdemo$EXEEXT" "$prefix/bin/mdemo_static$EXEEXT" +# ls -l in MSYS sometimes shows year, not time, for really fresh files. +sleep 1 ls -l . $objdir | grep -v total > $before ls -lR $prefix | grep -v total >> $before force_dry_run=: $MAKE uninstall 1>&2 || exit $?