Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DB][BuildFile] Use ifarch instead of ifarchitecture to match system arch only. #37924

Merged
merged 1 commit into from May 13, 2022
Merged

[DB][BuildFile] Use ifarch instead of ifarchitecture to match system arch only. #37924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions CondCore/CondDB/test/BuildFile.xml
View file
Open in desktop
Expand Up @@ -41,10 +41,10 @@
<bin file="testGroupSelection.cpp" name="testGroupSelection">
</bin>

<architecture name="(slc|cc).*_amd64_.*">
<ifarch value="x86_64">
<bin file="testConnectionPool.cpp" name="testConnectionPool">
<use name="CondFormats/RunInfo"/>
</bin>

<test name="condTestRegression" command="condTestRegression.py"/>
</architecture>
</ifarch>
4 changes: 2 additions & 2 deletions CondTools/Ecal/test/BuildFile.xml
View file
Open in desktop
@@ -1,5 +1,5 @@
<use name="CondTools/Ecal"/>
<architecture name="(slc|cc).*_amd64_.*">
<ifarch value="x86_64">
<ifcxx11_abi value="1">
<flags SETENV="LD_PRELOAD=$(CMS_ORACLEOCCI_LIB)"/>
</ifcxx11_abi>
Expand All @@ -24,4 +24,4 @@
<test name="EcalTPGTowerStatus_O2O_test" command="EcalTPGTowerStatus_O2O_test.sh"/>
<test name="EcalADCToGeV_update_test" command="EcalADCToGeV_update_test.sh"/>
<test name="EcalIntercalibConstants_O2O_test" command="EcalIntercalibConstants_O2O_test.sh"/>
</architecture>
</ifarch>
4 changes: 2 additions & 2 deletions CondTools/RunInfo/test/BuildFile.xml
View file
Open in desktop
@@ -1,6 +1,6 @@
<use name="CondTools/RunInfo"/>
<architecture name="(slc|cc).*_amd64_.*">
<ifarch value="x86_64">
<use name="py3-sqlalchemy"/>
<test name="RunInfoStart_O2O_test" command="RunInfoStart_O2O_test.sh"/>
</architecture>
</ifarch>
<test name="CondToolsRunInfoTest" command="test_runinfo.sh"/>
4 changes: 2 additions & 2 deletions CondTools/SiStrip/test/BuildFile.xml
View file
Open in desktop
@@ -1,10 +1,10 @@
<architecture name="(slc|cc).*_amd64_.*">
<ifarch value="x86_64">
<ifcxx11_abi value="1">
<flags SETENV="LD_PRELOAD=$(CMS_ORACLEOCCI_LIB)"/>
</ifcxx11_abi>
<test name="SiStripDCS_O2O_test" command="testSiStripDCSO2O.sh"/>
<test name="SiStripDAQ_O2O_test" command="testSiStripDAQO2O.sh"/>
</architecture>
</ifarch>

<bin file="runTests.cpp" name="testCondToolsSiStripBuildersReaders">
<use name="FWCore/Utilities"/>
Expand Down
5 changes: 2 additions & 3 deletions OnlineDB/Oracle/test/BuildFile.xml
View file
Open in desktop
@@ -1,7 +1,6 @@
<architecture name="_amd64_">
<ifarch value="x86_64">
<bin name="test_occi_std_length" file="test.cpp">
<use name="oracleocci"/>
<flags TEST_RUNNER_ARGS="12154"/>
</bin>

</architecture>
</ifarch>