[lttng-dev] [PATCH 1/3] tests/lib/Makefile.am: Remove test_seek_empty_packet and test_seek_big_trace from SCRIPT_LIST

[Simon Marchi]

On 2016-04-28 12:16, Michael Jeanson wrote:
> ----- On Apr 27, 2016, at 11:04 PM, Simon Marchi 
> simon.marchi at polymtl.ca wrote:
> 
>> On 2016-04-27 22:52, Simon Marchi wrote:
>>> Since these files are generated by autoconf, they shouldn't be 
>>> included
>>> in SCRIPT_LIST, which is the list of scripts to copy from the source
>>> directory to the build directory.  This gets rid of these warnings 
>>> when
>>> building:
>>> 
>>>   cp: cannot stat
>>> '/home/simark/src/babeltrace/tests/lib/test_seek_big_trace': No such
>>> file or directory
>>>   cp: cannot stat
>>> '/home/simark/src/babeltrace/tests/lib/test_seek_empty_packet': No
>>> such file or directory
>>> 
>>> Signed-off-by: Simon Marchi <simon.marchi at polymtl.ca>
>>> ---
>>>  tests/lib/Makefile.am | 4 +---
>>>  1 file changed, 1 insertion(+), 3 deletions(-)
>>> 
>>> diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
>>> index e23bcc1..a08cbf6 100644
>>> --- a/tests/lib/Makefile.am
>>> +++ b/tests/lib/Makefile.am
>>> @@ -41,9 +41,7 @@ test_bt_values_SOURCES = test_bt_values.c
>>>  test_ctf_ir_ref_SOURCES = test_ctf_ir_ref.c
>>>  test_bt_ctf_field_type_validation_SOURCES =
>>> test_bt_ctf_field_type_validation.c
>>> 
>>> -SCRIPT_LIST = test_seek_big_trace \
>>> -	test_seek_empty_packet \
>>> -	test_ctf_writer_complete
>>> +SCRIPT_LIST = test_ctf_writer_complete
>>>  EXTRA_DIST = test_seek_big_trace.in test_seek_empty_packet.in
>>>  CLEANFILES= test_seek_big_trace test_seek_empty_packet
>> 
>> Sorry, forgot to mention that this series is meant for babeltrace.
> 
> Good catch, I reviewed the patches and I'm working on an updated
> version to do further cleanup of the Makefile and test scripts
> generation.

Ok thanks.

Just an idea: I find it quite cumbersome to add a new entry in 
configure.ac for each test script that we want autoconf to process (such 
as in patch 3/3).  I think it could be easier to have a single file 
(e.g. vars.sh) and have it contain definitions of various directories:

   srcdir=@srcdir@
   top_srcdir=@top_srcdir@
   abs_top_srcdir=@abs_top_srcdir@
   builddir=@builddir@
   ...

This way, you could have only a single generated file (vars.sh.in -> 
vars.sh), and each test script would just have to source that file to 
use the values.