Andrew Black wrote:
> Greetings all.
>
> Builds with the latest overnight testing archive show most unix builds
> resulting in a 'DATA' state. This state indicates either a problem in
> running the generated executables, or a problem analyzing the results.
> Based on my manual build and the result log, it appears that the former
> is the cause, rather than the later.
>
> In particular, the run target in makefile.rules seems to be broken.
> After a little experimentation, I have determined that the cause seems
> to be a missing ; on line 117, introduced in
> http://svn.apache.org/viewvc?view=rev&rev=485859 . However, it appears
> to me that the if-then-else construct is unnecessary, as the same
> command is being executed in both code paths.
>
> Attached is a patch that removes this construct and repairs the broken
> behavior.
Good catch! Please check it in.
Thanks
Martin
>
> --Andrew Black
>
> Changelog:
> * makefile.rules (run runall run_all): Remove unneeded if-then-else-fi
> construct, fixing bug introduced in
> http://svn.apache.org/viewvc?view=rev&rev=485859 in the process.
>
>
> ------------------------------------------------------------------------
>
> Index: etc/config/makefile.rules
> ===================================================================
> --- etc/config/makefile.rules (revision 486196)
> +++ etc/config/makefile.rules (working copy)
> @@ -113,11 +113,7 @@
> PATH=$$PATH:.; \
> TOPDIR=$(TOPDIR); \
> export LD_LIBRARY_PATH PATH TOPDIR; \
> - if [ -z "$(RUNTARGET)" ]; then \
> - ./run $(RUNFLAGS) \
> - else \
> - ./run $(RUNFLAGS) $(RUNTARGET); \
> - fi ; \
> + ./run $(RUNFLAGS) $(RUNTARGET); \
> exit 0)
>
> # include the automatically generated dependencies unless "clean"
|