From 24efa706939752487d8f8c9742400182d513157f Mon Sep 17 00:00:00 2001 From: Shaun Tancheff Date: Wed, 24 Jun 2020 13:36:38 -0500 Subject: [PATCH] LU-13485 build: Make parallel tests names unique This iteration re-used the serial tests internal name for the parallel test variant. This name clashing causes builds to fail. Remedy this by adding a postfix tag the internal unique identifier of the converted parallel tests. Test-Parameters: trivial Signed-off-by: Shaun Tancheff Change-Id: Ia39bf2e0004abd10a0c7b146eb2ef1cf62e6d891 Reviewed-on: https://review.whamcloud.com/39161 Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Tested-by: jenkins Tested-by: Maloo Reviewed-by: Patrick Farrell --- config/lustre-build-linux.m4 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/lustre-build-linux.m4 b/config/lustre-build-linux.m4 index 832bd15..890feb1 100644 --- a/config/lustre-build-linux.m4 +++ b/config/lustre-build-linux.m4 @@ -803,8 +803,8 @@ AC_DEFUN([LB2_LINUX_TEST_COMPILE_ALL], [ # source is generated. # AC_DEFUN([LB2_LINUX_TEST_SRC], [ - LB2_LINUX_CONFTEST_C([LB_LANG_PROGRAM([[$2]], [[$3]])], [$1]) - LB2_LINUX_CONFTEST_MAKEFILE([$1], [$4], [$5]) + LB2_LINUX_CONFTEST_C([LB_LANG_PROGRAM([[$2]], [[$3]])], [$1_pc]) + LB2_LINUX_CONFTEST_MAKEFILE([$1_pc], [$4], [$5]) ]) # @@ -815,8 +815,8 @@ AC_DEFUN([LB2_LINUX_TEST_SRC], [ # $3 - run on failure (unable to compile) # AC_DEFUN([LB2_LINUX_TEST_RESULT], [ - AS_IF([test -d ${TEST_DIR}/$1], [ - AS_IF([test -f ${TEST_DIR}/$1/$1.ko], [$2], [$3]) + AS_IF([test -d ${TEST_DIR}/$1_pc], [ + AS_IF([test -f ${TEST_DIR}/$1_pc/$1_pc.ko], [$2], [$3]) ], [ AC_MSG_ERROR([ *** No matching source for the "$1" test, check that -- 1.8.3.1