summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-31 23:57:02 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-31 23:57:02 +0000
commit29ae946e0164a5bee085096b3784406309f2b659 (patch)
treea2491d58bcaf7fcf3d3b3db02a2ed53813b8d8ab /content
parent16c242d82a14a765a70eaa124271d12b39d97923 (diff)
downloadchromium_src-29ae946e0164a5bee085096b3784406309f2b659.zip
chromium_src-29ae946e0164a5bee085096b3784406309f2b659.tar.gz
chromium_src-29ae946e0164a5bee085096b3784406309f2b659.tar.bz2
GTTF: Remove support for _CRASH suffix in TestLauncher
This is a step toward moving TestLauncher to base/test BUG=236893 R=jam@chromium.org Review URL: https://codereview.chromium.org/16254008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/public/test/test_launcher.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc
index 1d80605..abf4b26 100644
--- a/content/public/test/test_launcher.cc
+++ b/content/public/test/test_launcher.cc
@@ -55,10 +55,6 @@ const char kPreTestPrefix[] = "PRE_";
// add a new binary that must be compiled on all builds.
const char kManualTestPrefix[] = "MANUAL_";
-// Tests with this suffix are expected to crash, so it won't count as a failure.
-// A test that uses this must have a PRE_ prefix.
-const char kCrashTestSuffix[] = "_CRASH";
-
TestLauncherDelegate* g_launcher_delegate;
}
@@ -317,10 +313,8 @@ int RunTestInternal(const testing::TestCase* test_case,
if (cur_test_name == pre_test_name) {
int exit_code = RunTestInternal(test_case, pre_test_name, command_line,
default_timeout, was_timeout);
- if (exit_code != 0 &&
- !EndsWith(pre_test_name, kCrashTestSuffix, true)) {
+ if (exit_code != 0)
return exit_code;
- }
}
}
}