diff options
| author | mdempsky@chromium.org <mdempsky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 18:11:15 +0000 |
|---|---|---|
| committer | mdempsky@chromium.org <mdempsky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 18:11:15 +0000 |
| commit | d538c32979f1fd0812753d1b1fe15edc4dcd4bb4 (patch) | |
| tree | fb0a36f3ecf3ecd94a48ebd393dc7ffc67355f99 /sandbox | |
| parent | 7694dd426abf4fa84417b99c069f7c5992ee4262 (diff) | |
| download | chromium_src-d538c32979f1fd0812753d1b1fe15edc4dcd4bb4.zip chromium_src-d538c32979f1fd0812753d1b1fe15edc4dcd4bb4.tar.gz chromium_src-d538c32979f1fd0812753d1b1fe15edc4dcd4bb4.tar.bz2 | |
Revert of Fix DEATH_BY_SIGNAL test helper (https://codereview.chromium.org/193453002/)
Reason for revert:
UnitTests.DeathBySignal is failing on Android: http://crbug.com/352226
Original issue's description:
> Fix DEATH_BY_SIGNAL test helper
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256653
TBR=jln@chromium.org,mdempsky@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/198923004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256872 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sandbox')
| -rw-r--r-- | sandbox/linux/sandbox_linux_test_sources.gypi | 1 | ||||
| -rw-r--r-- | sandbox/linux/tests/unit_tests.h | 2 | ||||
| -rw-r--r-- | sandbox/linux/tests/unit_tests_unittest.cc | 24 |
3 files changed, 1 insertions, 26 deletions
diff --git a/sandbox/linux/sandbox_linux_test_sources.gypi b/sandbox/linux/sandbox_linux_test_sources.gypi index e81c2a8..a48017b 100644 --- a/sandbox/linux/sandbox_linux_test_sources.gypi +++ b/sandbox/linux/sandbox_linux_test_sources.gypi @@ -19,7 +19,6 @@ 'tests/test_utils.h', 'tests/unit_tests.cc', 'tests/unit_tests.h', - 'tests/unit_tests_unittest.cc', 'services/broker_process_unittest.cc', 'services/scoped_process_unittest.cc', 'services/thread_helpers_unittests.cc', diff --git a/sandbox/linux/tests/unit_tests.h b/sandbox/linux/tests/unit_tests.h index 3f6092e..74aabe4 100644 --- a/sandbox/linux/tests/unit_tests.h +++ b/sandbox/linux/tests/unit_tests.h @@ -47,7 +47,7 @@ bool IsRunningOnValgrind(); sandbox::UnitTests::DeathExitCode, \ reinterpret_cast<void*>(static_cast<intptr_t>(rc)) #define DEATH_BY_SIGNAL(s) \ - sandbox::UnitTests::DeathBySignal, \ + sandbox::UnitTests::DeathExitCode, \ reinterpret_cast<void*>(static_cast<intptr_t>(s)) // A SANDBOX_DEATH_TEST is just like a SANDBOX_TEST (see below), but it assumes diff --git a/sandbox/linux/tests/unit_tests_unittest.cc b/sandbox/linux/tests/unit_tests_unittest.cc deleted file mode 100644 index a8bfb03..0000000 --- a/sandbox/linux/tests/unit_tests_unittest.cc +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include <signal.h> -#include <stdlib.h> - -#include "sandbox/linux/tests/unit_tests.h" - -namespace sandbox { - -namespace { - -SANDBOX_DEATH_TEST(UnitTests, DeathExitCode, DEATH_EXIT_CODE(42)) { - exit(42); -} - -SANDBOX_DEATH_TEST(UnitTests, DeathBySignal, DEATH_BY_SIGNAL(SIGABRT)) { - abort(); -} - -} // namespace - -} // namespace sandbox |