diff options
| author | Jacob Schloss <jschloss@swiftengineering.com> | 2018-08-22 12:55:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-22 12:55:43 -0700 |
| commit | 6de39826aa190a07179a8104c00ad11ea20d8679 (patch) | |
| tree | 3413eb72b75b6aad6392407713f5596c0f477fd6 /googletest/test/googletest-death-test-test.cc | |
| parent | 6e7980164593bfe888d6e94ee52d4d08bdddb412 (diff) | |
| parent | 1d9a1912e7f42e8ae66ea365b5b8508fecb31509 (diff) | |
| download | googletest-6de39826aa190a07179a8104c00ad11ea20d8679.tar.gz googletest-6de39826aa190a07179a8104c00ad11ea20d8679.zip | |
Merge branch 'master' into issue_1735
Diffstat (limited to 'googletest/test/googletest-death-test-test.cc')
| -rw-r--r-- | googletest/test/googletest-death-test-test.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/googletest/test/googletest-death-test-test.cc b/googletest/test/googletest-death-test-test.cc index 9d8f13c6..c0c3026f 100644 --- a/googletest/test/googletest-death-test-test.cc +++ b/googletest/test/googletest-death-test-test.cc @@ -26,8 +26,7 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) + // // Tests for death tests. @@ -1280,7 +1279,7 @@ TEST(ParseNaturalNumberTest, WorksForShorterIntegers) { # if GTEST_OS_WINDOWS TEST(EnvironmentTest, HandleFitsIntoSizeT) { - // TODO(vladl@google.com): Remove this test after this condition is verified + // FIXME: Remove this test after this condition is verified // in a static assertion in gtest-death-test.cc in the function // GetStatusFileDescriptor. ASSERT_TRUE(sizeof(HANDLE) <= sizeof(size_t)); |
