Module Name:    src
Committed By:   martin
Date:           Fri Jan 30 07:53:15 UTC 2015

Modified Files:
        src/external/bsd/atf/dist/atf-c [netbsd-7]: macros_test.c
        src/external/bsd/atf/dist/atf-c++ [netbsd-7]: macros_test.cpp

Log Message:
Pull up following revision(s) (requested by gson in ticket #471):
        external/bsd/atf/dist/atf-c++/macros_test.cpp: revision 1.2
        external/bsd/atf/dist/atf-c/macros_test.c: revision 1.5
Mark atf/atf-c/macros_test/detect_unused_tests and
atf/atf-c++/macros_test/detect_unused_tests as expected failures
when using versions of GCC where they are known to fail, with a
reference to PR toolchain/49187.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 src/external/bsd/atf/dist/atf-c/macros_test.c
cvs rdiff -u -r1.1.1.8 -r1.1.1.8.4.1 \
    src/external/bsd/atf/dist/atf-c++/macros_test.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/bsd/atf/dist/atf-c/macros_test.c
diff -u src/external/bsd/atf/dist/atf-c/macros_test.c:1.4 src/external/bsd/atf/dist/atf-c/macros_test.c:1.4.4.1
--- src/external/bsd/atf/dist/atf-c/macros_test.c:1.4	Sat Feb  8 19:13:43 2014
+++ src/external/bsd/atf/dist/atf-c/macros_test.c	Fri Jan 30 07:53:15 2015
@@ -863,6 +863,10 @@ ATF_TC_BODY(detect_unused_tests, tc)
         atf_tc_expect_fail("Compiler does not raise a warning on an unused "
                            "static global variable declared by a macro");
 
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
+        atf_tc_expect_fail("PR 49187");
+#endif
+
     if (build_check_c_o_srcdir(tc, "unused_test.c"))
         atf_tc_fail("Build of unused_test.c passed; unused test cases are "
                     "not properly detected");

Index: src/external/bsd/atf/dist/atf-c++/macros_test.cpp
diff -u src/external/bsd/atf/dist/atf-c++/macros_test.cpp:1.1.1.8 src/external/bsd/atf/dist/atf-c++/macros_test.cpp:1.1.1.8.4.1
--- src/external/bsd/atf/dist/atf-c++/macros_test.cpp:1.1.1.8	Sat Feb  8 19:11:31 2014
+++ src/external/bsd/atf/dist/atf-c++/macros_test.cpp	Fri Jan 30 07:53:15 2015
@@ -783,6 +783,10 @@ ATF_TEST_CASE_BODY(detect_unused_tests)
         expect_fail("Compiler does not raise a warning on an unused "
                     "static global variable declared by a macro");
 
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
+        expect_fail("PR 49187");
+#endif
+
     if (build_check_cxx_o_srcdir(*this, "unused_test.cpp"))
         ATF_FAIL("Build of unused_test.cpp passed; unused test cases are "
                  "not properly detected");

Reply via email to