Experimental Physics and
Industrial Control System

Michael Davidsaver via Core-talk <core-talk at aps.anl.gov> · Wed, 3 Jun 2020 11:06:10 -0700

> git apply /tmp/dirk.diff
> error: patch failed: configure/RULES_MODULES:50
> error: configure/RULES_MODULES: patch does not apply

Please send patches as attachments.
(or use git-send-email if you really must)

On 6/3/20 10:59 AM, Johnson, Andrew N. via Core-talk wrote:
> Hi Dirk,
> 
> On Jun 3, 2020, at 3:06 AM, Zimoch Dirk (PSI) via Core-talk <core-talk at aps.anl.gov <mailto:core-talk at aps.anl.gov>> wrote:
>>
>> In the current 7.0 branch, running 'make runtests' ends with an error:
>>
>> [...]
>> All tests successful.
>> Files=11, Tests=293,  1 wallclock secs ( 0.07 usr  0.01 sys +  0.25 cusr  0.07 csys =  0.40 CPU)
>> Result: PASS
>> -------------------
>>
>> make[5]: Leaving directory `/afs/psi.ch/group/8211/dirk/git/BASE/epics-base-7.0-work/modules/database/test/tools/O.linux-x86_64' <http://psi.ch/group/8211/dirk/git/BASE/epics-base-7.0-work/modules/database/test/tools/O.linux-x86_64'>
>> make[4]: Leaving directory `/afs/psi.ch/group/8211/dirk/git/BASE/epics-base-7.0-work/modules/database/test/tools' <http://psi.ch/group/8211/dirk/git/BASE/epics-base-7.0-work/modules/database/test/tools'>
>> make[3]: Leaving directory `/afs/psi.ch/group/8211/dirk/git/BASE/epics-base-7.0-work/modules/database/test' <http://psi.ch/group/8211/dirk/git/BASE/epics-base-7.0-work/modules/database/test'>
>> make[2]: Leaving directory `/afs/psi.ch/group/8211/dirk/git/BASE/epics-base-7.0-work/modules/database' <http://psi.ch/group/8211/dirk/git/BASE/epics-base-7.0-work/modules/database'>
>> touch: missing file operand
>> Try 'touch --help' for more information.
>> make[1]: *** [runtests] Error 1
>> make[1]: Leaving directory `/afs/psi.ch/group/8211/dirk/git/BASE/epics-base-7.0-work/modules' <http://psi.ch/group/8211/dirk/git/BASE/epics-base-7.0-work/modules'>
>> make: *** [modules.runtests] Error 2
> 
> Looking at configure/RULES_MODULES I can see that this can happen if you have none of the submodules checked out. That is a legitimate configuration for Base which I know you use but I didn’t test, so my mistake, sorry!
> 
> Ralph – it wasn’t so much that there was a space in a variable, but that the rule wasn’t expecting the list of submodules to be empty.
> 
> Here’s a patch that should fix the problem, please let me know if it does so I can commit it (careful with wrapping, there are some long lines in it).
> 
> *diff --git a/configure/RULES_MODULES b/configure/RULES_MODULES*
> *index a163ce18d..57a459173 100644*
> *--- a/configure/RULES_MODULES*
> *+++ b/configure/RULES_MODULES*
> @@ -50,9 +50,11 @@realclean:
>  # Append all our live submodule failure files
>  FAILURE_FILES = $(addsuffix /$(TEST_FAILURE_FILENAME), $(LIVE_SUBMODULES))
> 
>  
> 
> -runtests: | $(addsuffix $(DIVIDER)runtests, $(LIVE_SUBMODULES))
> +define combine_failure_files
>         @$(TOUCH) $(FAILURE_FILES)
>         @$(CAT) $(FAILURE_FILES) >> $(TEST_FAILURE_FILE)
> +endef
> +runtests: | $(addsuffix $(DIVIDER)runtests, $(LIVE_SUBMODULES))
> +      $(if $(FAILURE_FILES), $(combine_failure_files))
>  test-results: | $(addsuffix $(DIVIDER)test-results, $(LIVE_SUBMODULES))
> -       @$(TOUCH) $(FAILURE_FILES)
> -       @$(CAT) $(FAILURE_FILES) >> $(TEST_FAILURE_FILE)
> +      $(if $(FAILURE_FILES), $(combine_failure_files))
> 
> 
> - Andrew
> 
> -- 
> Complexity comes for free, simplicity you have to work for.
> 

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System