From f58de0d67adb6eb1c852c294e18d8877eda582fc Mon Sep 17 00:00:00 2001 From: Jonathan Tims Date: Mon, 31 Jul 2023 11:25:05 +0100 Subject: [PATCH] w --- build/vstest-fast.yml | 4 ++-- test/monotest.sh | 2 +- test/netcoretest.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/vstest-fast.yml b/build/vstest-fast.yml index 0b9d739e..57f2d879 100644 --- a/build/vstest-fast.yml +++ b/build/vstest-fast.yml @@ -15,7 +15,7 @@ steps: inputs: testSelector: 'testAssemblies' testAssemblyVer2: test/Tests/bin/*/net472/Microsoft.ML.Probabilistic.Tests.dll - testFiltercriteria: '(Platform!=x86)&(((Category=CsoftModel)|(Category=ModifiesGlobals)|(Category=DistributedTests)|(Category=Performance))&(Category!=OpenBug)&(Category!=BadTest)&(Category!=CompilerOptionsTest))' + testFiltercriteria: '(Platform!=x86)&(((Category=CsoftModel)|(Category=ModifiesGlobals)|(Category=DistributedTest)|(Category=Performance))&(Category!=OpenBug)&(Category!=BadTest)&(Category!=CompilerOptionsTest))' runInParallel: false runSettingsFile: test.runsettings - task: VSTest@2 @@ -36,7 +36,7 @@ steps: inputs: testSelector: 'testAssemblies' testAssemblyVer2: test/Tests/bin/*/net472/Microsoft.ML.Probabilistic.Tests.dll - testFiltercriteria: '(Platform!=x64)&(((Category=CsoftModel)|(Category=ModifiesGlobals)|(Category=DistributedTests)|(Category=Performance))&(Category!=OpenBug)&(Category!=BadTest)&(Category!=CompilerOptionsTest))' + testFiltercriteria: '(Platform!=x64)&(((Category=CsoftModel)|(Category=ModifiesGlobals)|(Category=DistributedTest)|(Category=Performance))&(Category!=OpenBug)&(Category!=BadTest)&(Category!=CompilerOptionsTest))' runInParallel: false runSettingsFile: x86.runsettings - task: VSTest@2 diff --git a/test/monotest.sh b/test/monotest.sh index dc9f540f..ad356876 100644 --- a/test/monotest.sh +++ b/test/monotest.sh @@ -37,7 +37,7 @@ runner=~/.nuget/packages/xunit.runner.console/2.4.1/tools/net452/xunit.console.e parallel_filter='-notrait Platform=x86 -notrait Category=OpenBug -notrait Category=BadTest -notrait Category=CompilerOptionsTest -notrait Category=CsoftModel -notrait Category=ModifiesGlobals -notrait Category=DistributedTest -notrait Category=Performance' # filter for sequential test run -sequential_filter='-notrait Platform=x86 -trait Category=CsoftModel -trait Category=ModifiesGlobals -trait Category=DistributedTests -trait Category=Performance -notrait Category=OpenBug -notrait Category=BadTest -notrait Category=CompilerOptionsTest' +sequential_filter='-notrait Platform=x86 -trait Category=CsoftModel -trait Category=ModifiesGlobals -trait Category=DistributedTest -trait Category=Performance -notrait Category=OpenBug -notrait Category=BadTest -notrait Category=CompilerOptionsTest' exitcode=0 diff --git a/test/netcoretest.sh b/test/netcoretest.sh index 52c4d8f0..8b1b4541 100644 --- a/test/netcoretest.sh +++ b/test/netcoretest.sh @@ -22,8 +22,8 @@ compath=/bin/${configuration}/net6.0/ parallel_filter='--filter (Platform!=x86)&(Category!=OpenBug)&(Category!=BadTest)&(Category!=CompilerOptionsTest)&(Category!=CsoftModel)&(Category!=ModifiesGlobals)&(Category!=DistributedTest)&(Category!=Performance)' # filter for sequential test run -#sequential_filter='-notrait Platform=x86 -trait Category=CsoftModel -trait Category=ModifiesGlobals -trait Category=DistributedTests -trait Category=Performance -notrait Category=OpenBug -notrait Category=BadTest -notrait Category=CompilerOptionsTest' -sequential_filter='--filter (Platform!=x86)&(Category!=OpenBug)&(Category!=BadTest)&(Category!=CompilerOptionsTest)&(Category=CsoftModel|Category=ModifiesGlobals|Category=DistributedTests|Category=Performance)' +#sequential_filter='-notrait Platform=x86 -trait Category=CsoftModel -trait Category=ModifiesGlobals -trait Category=DistributedTest -trait Category=Performance -notrait Category=OpenBug -notrait Category=BadTest -notrait Category=CompilerOptionsTest' +sequential_filter='--filter (Platform!=x86)&(Category!=OpenBug)&(Category!=BadTest)&(Category!=CompilerOptionsTest)&(Category=CsoftModel|Category=ModifiesGlobals|Category=DistributedTest|Category=Performance)' exitcode=0