From: Nathaniel Clark <nclark@whamcloud.com>
Date: Thu, 6 Jan 2022 13:50:46 +0000 (-0500)
Subject: LU-15415 tests: Use correct PYTHON in Makefile.am
X-Git-Tag: 2.14.57~12
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=087c02caf1f8193a67373687eb54b576d90c0fe7;p=fs%2Flustre-release.git

LU-15415 tests: Use correct PYTHON in Makefile.am

Use already defined PYTHON from autoMake, instead of trying to
guess correct one using undefined PYTHON_VERSION.

Test-Parameters: trivial
Signed-off-by: Nathaniel Clark <nclark@whamcloud.com>
Change-Id: I44e2e5d44121c0bd39cf3032ae228bd6cd442a8c
Reviewed-on: https://review.whamcloud.com/45989
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Minh Diep <mdiep@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Chris Horn <chris.horn@hpe.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/lustre/tests/lutf/src/Makefile.am b/lustre/tests/lutf/src/Makefile.am
index 0941eb6..8c4d7d0 100644
--- a/lustre/tests/lutf/src/Makefile.am
+++ b/lustre/tests/lutf/src/Makefile.am
@@ -1,6 +1,5 @@
 # Administration utilities Makefile
 
-PYTHON_BIN=python$(PYTHON_VERSION)
 SWIG_COMPFLAGS=-g -Wall -fPIC -c
 SWIG_FLAGS=-D__x86_64__
 SWIG_INCLUDES=-I/usr/include -I/usr/include/linux -I/usr/include/c++/4.4.4/tr1 -I/usr/include/c++/4.4.4/cstdbool
@@ -54,9 +53,9 @@ lutf_DEPENDENCIES := _clutf_agent.so _clutf_global.so dlc_glue
 
 update_swig_intf :
 	echo "updating lutf_agent.i"
-	$(PYTHON_BIN) $(UPDATE_LUTF_SWIG_INTF) $(GEN_SWIG_TEMPLATES) $(LUTF_AGENT_SWG)
+	$(PYTHON) $(UPDATE_LUTF_SWIG_INTF) $(GEN_SWIG_TEMPLATES) $(LUTF_AGENT_SWG)
 	echo "updating lutf_global.i"
-	$(PYTHON_BIN) $(UPDATE_LUTF_SWIG_INTF) $(GEN_SWIG_TEMPLATES) $(LUTF_GLOBAL_SWG)
+	$(PYTHON) $(UPDATE_LUTF_SWIG_INTF) $(GEN_SWIG_TEMPLATES) $(LUTF_GLOBAL_SWG)
 
 lutf_agent_wrap.c : update_swig_intf
 	echo "generating lutf_agent_warp.c"
@@ -98,7 +97,7 @@ liblutf_connect.so :
 
 dlc_glue:
 	echo "generating liblnetconfig.i"
-	$(PYTHON_BIN) $(GEN_SWIG_INTF_PY) $(top_builddir)
+	$(PYTHON) $(GEN_SWIG_INTF_PY) $(top_builddir)
 	echo "generating liblndconfig_wrap.c"
 	$(SWIG) -python $(DLC_SWIG_FLAGS) $(DLC_SWIG_INCLUDES) $(LNETCONFIG_I)
 	echo "building liblnetconfig_wrap.c"