When the build of tests outputs into an another directory (e.g. ./testdir) and 'make check' is running from there, pktio_run will run from the original source dir, so $(dirname $0)/../../../../test/validation/pktio will point to the original source as well. But pktio_main is in the build output dir. This patch adds that to the path. This should particularly happen in CI.
Signed-off-by: Zoltan Kiss zoltan.kiss@linaro.org ---
I still don't know why this isn't a problem in linux-generic when building with CI.
platform/linux-dpdk/test/pktio/pktio_run | 1 + 1 file changed, 1 insertion(+)
diff --git a/platform/linux-dpdk/test/pktio/pktio_run b/platform/linux-dpdk/test/pktio/pktio_run index 28b8d3b..3dbf1b9 100755 --- a/platform/linux-dpdk/test/pktio/pktio_run +++ b/platform/linux-dpdk/test/pktio/pktio_run @@ -15,6 +15,7 @@ PATH=${TEST_DIR}/pktio:$PATH PATH=$(dirname $0):$PATH PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=${PWD}/../../../test/validation/pktio:$PATH PATH=.:$PATH
pktio_main_path=$(which pktio_main${EXEEXT})
Sorry, I forgot to give a proper subject to the patch, it should end like "fix pktio_run PATH setup"
On 07/08/15 17:31, Zoltan Kiss wrote:
When the build of tests outputs into an another directory (e.g. ./testdir) and 'make check' is running from there, pktio_run will run from the original source dir, so $(dirname $0)/../../../../test/validation/pktio will point to the original source as well. But pktio_main is in the build output dir. This patch adds that to the path. This should particularly happen in CI.
Signed-off-by: Zoltan Kiss zoltan.kiss@linaro.org
I still don't know why this isn't a problem in linux-generic when building with CI.
platform/linux-dpdk/test/pktio/pktio_run | 1 + 1 file changed, 1 insertion(+)
diff --git a/platform/linux-dpdk/test/pktio/pktio_run b/platform/linux-dpdk/test/pktio/pktio_run index 28b8d3b..3dbf1b9 100755 --- a/platform/linux-dpdk/test/pktio/pktio_run +++ b/platform/linux-dpdk/test/pktio/pktio_run @@ -15,6 +15,7 @@ PATH=${TEST_DIR}/pktio:$PATH PATH=$(dirname $0):$PATH PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=${PWD}/../../../test/validation/pktio:$PATH PATH=.:$PATH
pktio_main_path=$(which pktio_main${EXEEXT})
Applied
On 07/08/15 17:35, Zoltan Kiss wrote:
Sorry, I forgot to give a proper subject to the patch, it should end like "fix pktio_run PATH setup"
On 07/08/15 17:31, Zoltan Kiss wrote:
When the build of tests outputs into an another directory (e.g. ./testdir) and 'make check' is running from there, pktio_run will run from the original source dir, so $(dirname $0)/../../../../test/validation/pktio will point to the original source as well. But pktio_main is in the build output dir. This patch adds that to the path. This should particularly happen in CI.
Signed-off-by: Zoltan Kiss zoltan.kiss@linaro.org
I still don't know why this isn't a problem in linux-generic when building with CI.
platform/linux-dpdk/test/pktio/pktio_run | 1 + 1 file changed, 1 insertion(+)
diff --git a/platform/linux-dpdk/test/pktio/pktio_run b/platform/linux-dpdk/test/pktio/pktio_run index 28b8d3b..3dbf1b9 100755 --- a/platform/linux-dpdk/test/pktio/pktio_run +++ b/platform/linux-dpdk/test/pktio/pktio_run @@ -15,6 +15,7 @@ PATH=${TEST_DIR}/pktio:$PATH PATH=$(dirname $0):$PATH PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=${PWD}/../../../test/validation/pktio:$PATH PATH=.:$PATH
pktio_main_path=$(which pktio_main${EXEEXT})
On Fri, Aug 07, 2015 at 05:31:25PM +0100, Zoltan Kiss wrote:
When the build of tests outputs into an another directory (e.g. ./testdir) and 'make check' is running from there, pktio_run will run from the original source dir, so $(dirname $0)/../../../../test/validation/pktio will point to the original source as well. But pktio_main is in the build output dir. This patch adds that to the path. This should particularly happen in CI.
Signed-off-by: Zoltan Kiss zoltan.kiss@linaro.org
I still don't know why this isn't a problem in linux-generic when building with CI.
When you run via "make check" the path gets passed in the TEST_DIR variable, which is set in platform/linux-generic/test/Makefile.am
platform/linux-dpdk/test/pktio/pktio_run | 1 + 1 file changed, 1 insertion(+)
diff --git a/platform/linux-dpdk/test/pktio/pktio_run b/platform/linux-dpdk/test/pktio/pktio_run index 28b8d3b..3dbf1b9 100755 --- a/platform/linux-dpdk/test/pktio/pktio_run +++ b/platform/linux-dpdk/test/pktio/pktio_run @@ -15,6 +15,7 @@ PATH=${TEST_DIR}/pktio:$PATH PATH=$(dirname $0):$PATH PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=${PWD}/../../../test/validation/pktio:$PATH PATH=.:$PATH pktio_main_path=$(which pktio_main${EXEEXT}) -- 1.9.1
On 07/08/15 17:59, Stuart Haslam wrote:
On Fri, Aug 07, 2015 at 05:31:25PM +0100, Zoltan Kiss wrote:
When the build of tests outputs into an another directory (e.g. ./testdir) and 'make check' is running from there, pktio_run will run from the original source dir, so $(dirname $0)/../../../../test/validation/pktio will point to the original source as well. But pktio_main is in the build output dir. This patch adds that to the path. This should particularly happen in CI.
Signed-off-by: Zoltan Kiss zoltan.kiss@linaro.org
I still don't know why this isn't a problem in linux-generic when building with CI.
When you run via "make check" the path gets passed in the TEST_DIR variable, which is set in platform/linux-generic/test/Makefile.am
We already do the same in platform/linux-dpdk/test/Makefile.am
platform/linux-dpdk/test/pktio/pktio_run | 1 + 1 file changed, 1 insertion(+)
diff --git a/platform/linux-dpdk/test/pktio/pktio_run b/platform/linux-dpdk/test/pktio/pktio_run index 28b8d3b..3dbf1b9 100755 --- a/platform/linux-dpdk/test/pktio/pktio_run +++ b/platform/linux-dpdk/test/pktio/pktio_run @@ -15,6 +15,7 @@ PATH=${TEST_DIR}/pktio:$PATH PATH=$(dirname $0):$PATH PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=${PWD}/../../../test/validation/pktio:$PATH PATH=.:$PATH
pktio_main_path=$(which pktio_main${EXEEXT})
1.9.1
On 07/08/15 18:06, Zoltan Kiss wrote:
On 07/08/15 17:59, Stuart Haslam wrote:
On Fri, Aug 07, 2015 at 05:31:25PM +0100, Zoltan Kiss wrote:
When the build of tests outputs into an another directory (e.g. ./testdir) and 'make check' is running from there, pktio_run will run from the original source dir, so $(dirname $0)/../../../../test/validation/pktio will point to the original source as well. But pktio_main is in the build output dir. This patch adds that to the path. This should particularly happen in CI.
Signed-off-by: Zoltan Kiss zoltan.kiss@linaro.org
I still don't know why this isn't a problem in linux-generic when building with CI.
When you run via "make check" the path gets passed in the TEST_DIR variable, which is set in platform/linux-generic/test/Makefile.am
We already do the same in platform/linux-dpdk/test/Makefile.am
Hm, it seems somehow it's still not set. Maybe it has something to do with the wrapper script?
platform/linux-dpdk/test/pktio/pktio_run | 1 + 1 file changed, 1 insertion(+)
diff --git a/platform/linux-dpdk/test/pktio/pktio_run b/platform/linux-dpdk/test/pktio/pktio_run index 28b8d3b..3dbf1b9 100755 --- a/platform/linux-dpdk/test/pktio/pktio_run +++ b/platform/linux-dpdk/test/pktio/pktio_run @@ -15,6 +15,7 @@ PATH=${TEST_DIR}/pktio:$PATH PATH=$(dirname $0):$PATH PATH=$(dirname $0)/../../../../test/validation/pktio:$PATH +PATH=${PWD}/../../../test/validation/pktio:$PATH PATH=.:$PATH
pktio_main_path=$(which pktio_main${EXEEXT})
1.9.1
-
Stuart Haslam -
Zoltan Kiss