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

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

[Simon Marchi]

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
 
-- 
2.8.0

[lttng-dev] [PATCH 2/3] tests/lib/Makefile.am: use DISTCLEANFILES instead of CLEANFILES

[Simon Marchi]

Files test_seek_empty_packet and test_seek_big_trace are generated by
configuring, not by making.  Therefore, we do not want a make clean to
remove them.  Otherwise, doing...

  * make
  * make clean
  * make
  * make check

... fails.

We want, however, to delete them when doing make distclean.

Signed-off-by: Simon Marchi <simon.marchi at polymtl.ca>
---
 tests/lib/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index a08cbf6..b39bd34 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -43,7 +43,7 @@ test_bt_ctf_field_type_validation_SOURCES = test_bt_ctf_field_type_validation.c
 
 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
+DISTCLEANFILES = test_seek_big_trace test_seek_empty_packet
 
 if ENABLE_DEBUGINFO
 test_dwarf_LDFLAGS = -static
-- 
2.8.0

[lttng-dev] [PATCH 3/3] tests/lib: Make test_dwarf and test_bin_info tests work out-of-tree

[Simon Marchi]

When building out of tree, these tests fail to find the test data.  This
patch makes them (their _complete wrappers, actually) generated by
Autoconf, so the proper path to the test data (which is in the source
directory) can be written.

Signed-off-by: Simon Marchi <simon.marchi at polymtl.ca>
---
 configure.ac                        |  2 ++
 tests/lib/Makefile.am               | 11 ++++++++---
 tests/lib/test_bin_info_complete    | 22 ----------------------
 tests/lib/test_bin_info_complete.in | 22 ++++++++++++++++++++++
 tests/lib/test_dwarf_complete       | 22 ----------------------
 tests/lib/test_dwarf_complete.in    | 21 +++++++++++++++++++++
 6 files changed, 53 insertions(+), 47 deletions(-)
 delete mode 100755 tests/lib/test_bin_info_complete
 create mode 100755 tests/lib/test_bin_info_complete.in
 delete mode 100755 tests/lib/test_dwarf_complete
 create mode 100755 tests/lib/test_dwarf_complete.in

diff --git a/configure.ac b/configure.ac
index 4578fc0..baeb4a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -353,6 +353,8 @@ AC_CONFIG_FILES([
 
 AC_CONFIG_FILES([tests/lib/test_seek_big_trace], [chmod +x tests/lib/test_seek_big_trace])
 AC_CONFIG_FILES([tests/lib/test_seek_empty_packet], [chmod +x tests/lib/test_seek_empty_packet])
+AC_CONFIG_FILES([tests/lib/test_dwarf_complete], [chmod +x tests/lib/test_dwarf_complete])
+AC_CONFIG_FILES([tests/lib/test_bin_info_complete], [chmod +x tests/lib/test_bin_info_complete])
 AC_CONFIG_FILES([tests/bin/test_trace_read], [chmod +x tests/bin/test_trace_read])
 AC_CONFIG_FILES([tests/bin/test_intersection], [chmod +x tests/bin/test_intersection])
 AC_CONFIG_FILES([tests/bin/test_packet_seq_num], [chmod +x tests/bin/test_packet_seq_num])
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index b39bd34..c0088a0 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -42,8 +42,14 @@ 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_ctf_writer_complete
-EXTRA_DIST = test_seek_big_trace.in test_seek_empty_packet.in
-DISTCLEANFILES = test_seek_big_trace test_seek_empty_packet
+EXTRA_DIST = test_seek_big_trace.in \
+	     test_seek_empty_packet.in \
+	     test_dwarf_complete.in \
+	     test_bin_info_complete.in
+DISTCLEANFILES = test_seek_big_trace \
+		 test_seek_empty_packet \
+		 test_dwarf_complete \
+		 test_bin_info_complete
 
 if ENABLE_DEBUGINFO
 test_dwarf_LDFLAGS = -static
@@ -59,7 +65,6 @@ test_bin_info_LDADD = $(LIBTAP) \
 test_bin_info_SOURCES = test_bin_info.c
 
 noinst_PROGRAMS += test_dwarf test_bin_info
-SCRIPT_LIST += test_dwarf_complete test_bin_info_complete
 endif
 
 dist_noinst_SCRIPTS = $(SCRIPT_LIST)
diff --git a/tests/lib/test_bin_info_complete b/tests/lib/test_bin_info_complete
deleted file mode 100755
index 0f93010..0000000
--- a/tests/lib/test_bin_info_complete
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2015 - Antoine Busque <abusque at efficios.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; only version 2
-# of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-CURDIR=$(dirname $0)/
-ROOTDIR=$CURDIR../..
-
-$CURDIR/test_bin_info $ROOTDIR/tests/debuginfo-data
diff --git a/tests/lib/test_bin_info_complete.in b/tests/lib/test_bin_info_complete.in
new file mode 100755
index 0000000..80c1e90
--- /dev/null
+++ b/tests/lib/test_bin_info_complete.in
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# Copyright (C) 2015 - Antoine Busque <abusque at efficios.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; only version 2
+# of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+
+DEBUGINFO_DATA=@abs_top_srcdir@/tests/debuginfo-data
+
+ at abs_top_builddir@/tests/lib/test_bin_info $DEBUGINFO_DATA
diff --git a/tests/lib/test_dwarf_complete b/tests/lib/test_dwarf_complete
deleted file mode 100755
index c633016..0000000
--- a/tests/lib/test_dwarf_complete
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2015 - Antoine Busque <abusque at efficios.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; only version 2
-# of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-CURDIR=$(dirname $0)/
-ROOTDIR=$CURDIR../..
-
-$CURDIR/test_dwarf $ROOTDIR/tests/debuginfo-data
diff --git a/tests/lib/test_dwarf_complete.in b/tests/lib/test_dwarf_complete.in
new file mode 100755
index 0000000..07d1677
--- /dev/null
+++ b/tests/lib/test_dwarf_complete.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# Copyright (C) 2015 - Antoine Busque <abusque at efficios.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; only version 2
+# of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+DEBUGINFO_DATA=@abs_top_srcdir@/tests/debuginfo-data
+
+ at abs_top_builddir@/tests/lib/test_dwarf $DEBUGINFO_DATA
-- 
2.8.0

[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-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.

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

[Michael Jeanson]

----- 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.

[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.

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

[Jérémie Galarneau]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2697 bytes --]

On Thu, Apr 28, 2016 at 12:44 PM, Simon Marchi <simon.marchi at polymtl.ca> wrote:
> 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.

Indeed, good idea.

Regards,
Jérémie

>
> _______________________________________________
> lttng-dev mailing list
> lttng-dev at lists.lttng.org
> https://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com

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

[Michael Jeanson]

----- On Apr 28, 2016, at 12:44 PM, Simon Marchi simon.marchi at polymtl.ca wrote:
> 
> 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.

As discussed on #lttng, here is the PR resulting from my updates to your
patches :

  https://github.com/efficios/babeltrace/pull/43


Concerning the include file, I'm not convinced it would be simpler, we would
end up with static scripts in the source dir including a generated file in
the builddir.

[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 14:28, Michael Jeanson wrote:
> ----- On Apr 28, 2016, at 12:44 PM, Simon Marchi 
> simon.marchi at polymtl.ca wrote:
>> 
>> 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.
> 
> As discussed on #lttng, here is the PR resulting from my updates to 
> your
> patches :
> 
>   https://github.com/efficios/babeltrace/pull/43

Thanks for following up.

> Concerning the include file, I'm not convinced it would be simpler, we 
> would
> end up with static scripts in the source dir including a generated file 
> in
> the builddir.

In the current state, even the static scripts are copied to the build 
dir, so it
wouldn't be a problem.  Anyway, if it's not a problem, I think it looks 
good in your
PR.