From 406ec45b2045b63a73719b1203f3418bace0d122 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Thu, 10 Dec 2015 22:42:07 +0100 Subject: ptest: set relative path for test-driver Starting with dizzy(poky v1.7) parallel testing was activated and test-driver is the log driver for this mechanism. But generated Makefile is using an absolute path when calls the test-driver which is a wrong path at run-time. Signed-off-by: Adrian Calianu Signed-off-by: George Nita Signed-off-by: Tudor Florea Signed-off-by: Adrian Calianu --- .../automake/new_rt_path_for_test-driver.patch | 35 ++++++++++++++++++++++ recipes-devtools/automake/automake_1.14.1.bbappend | 5 ++++ 2 files changed, 40 insertions(+) create mode 100644 recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch create mode 100644 recipes-devtools/automake/automake_1.14.1.bbappend (limited to 'recipes-devtools') diff --git a/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch b/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch new file mode 100644 index 0000000..fae10b3 --- /dev/null +++ b/recipes-devtools/automake/automake/new_rt_path_for_test-driver.patch @@ -0,0 +1,35 @@ +Set relative to top_builddir path in Makefile to access test-driver + +Signed-off-by: Adrian Calianu +Upstream-Status: Pending + +--- a/bin/automake.in ++++ b/bin/automake.in +@@ -272,6 +272,9 @@ + # $AM_CONFIG_AUX_DIR is prefixed with $(top_srcdir), so it can be used + # in Makefiles. + my $am_config_aux_dir = ''; ++# Directory used at runtime like running test-driver that should not ++# depend on $(top_srcdir) ++my $am_config_rt_aux_dir = ''; + + # Directory to search for AC_LIBSOURCE files, as set by AC_CONFIG_LIBOBJ_DIR + # in configure.ac. +@@ -4700,7 +4703,7 @@ + { + require_conf_file ("parallel-tests", FOREIGN, 'test-driver'); + define_variable ("${pfx}LOG_DRIVER", +- "\$(SHELL) $am_config_aux_dir/test-driver", ++ "\$(SHELL) $am_config_rt_aux_dir/test-driver", + INTERNAL); + } + my $driver = '$(' . $pfx . 'LOG_DRIVER)'; +@@ -7284,6 +7287,10 @@ + $am_config_aux_dir = + '$(top_srcdir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); + $am_config_aux_dir =~ s,/*$,,; ++ ++ $am_config_rt_aux_dir = ++ '$(top_builddir)' . ($config_aux_dir eq '.' ? "" : "/$config_aux_dir"); ++ $am_config_rt_aux_dir =~ s,/*$,,; + } diff --git a/recipes-devtools/automake/automake_1.14.1.bbappend b/recipes-devtools/automake/automake_1.14.1.bbappend new file mode 100644 index 0000000..c3f22b8 --- /dev/null +++ b/recipes-devtools/automake/automake_1.14.1.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += " \ + file://new_rt_path_for_test-driver.patch \ + " -- cgit v1.2.3-54-g00ecf