Remove no merge files option for hipcc builds (ROCm#1022)

hcman2 · Jun 9, 2020 · a93bc68 · a93bc68
1 parent 280e83b
commit a93bc68
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/.jenkins/common.groovy b/.jenkins/common.groovy
@@ -30,8 +30,7 @@ def runCompileCommand(platform, project, jobName, boolean debug=false)
             ####
             tox --version
             tox -v --workdir /tmp/.tensile-tox -e lint
-            #### temporarily enable --no-merge-files until hipclang update is posted
-            tox -v --workdir /tmp/.tensile-tox -e py35 -- ${test_dir} -m "${test_marks}" --junit-xml=\$(pwd)/python_unit_tests.xml --tensile-options=--no-merge-files,--cxx-compiler=${compiler} --timing-file=\$(pwd)/timing-\$gpuArch.csv
+            tox -v --workdir /tmp/.tensile-tox -e py35 -- ${test_dir} -m "${test_marks}" --junit-xml=\$(pwd)/python_unit_tests.xml --tensile-options=--cxx-compiler=${compiler} --timing-file=\$(pwd)/timing-\$gpuArch.csv
 
             mkdir build
             pushd build
@@ -116,8 +115,7 @@ def runTestCommand (platform, project, jobName, test_marks)
             export HOME=/home/jenkins
             ####
             tox --version
-            #### temporarily enable --no-merge-files until hipclang update is posted
-            tox -v --workdir /tmp/.tensile-tox -e py35 -- ${test_dir} -m "${test_marks}" --tensile-options=--no-merge-files,--cxx-compiler=${compiler} --timing-file=\$(pwd)/timing-\$gpuArch.csv
+            tox -v --workdir /tmp/.tensile-tox -e py35 -- ${test_dir} -m "${test_marks}" --tensile-options=--cxx-compiler=${compiler} --timing-file=\$(pwd)/timing-\$gpuArch.csv
             PY_ERR=\$?
             date