svn commit: r271875 - in head/contrib/atf: . atf-c

[Craig Rodrigues]

Author: rodrigc
Date: Fri Sep 19 17:18:27 2014
New Revision: 271875
URL: http://svnweb.freebsd.org/changeset/base/271875

Log:
  Reference the test case "packs" to fix warnings
  
  Put the various atf_tc_pack_t variables generated by ATF_TC to use in
  the macros_h_test.c file so that we prevent some build warnings (and
  thus some build errors) with clang and -Wunused.
  
  Obtained from:  atf (git 70126d013db25c72539803f19f7e00baddacdf51)

Modified:
  head/contrib/atf/NEWS
  head/contrib/atf/atf-c/macros_h_test.c

Modified: head/contrib/atf/NEWS
==============================================================================
--- head/contrib/atf/NEWS	Fri Sep 19 16:06:54 2014	(r271874)
+++ head/contrib/atf/NEWS	Fri Sep 19 17:18:27 2014	(r271875)
@@ -14,6 +14,9 @@ the 'tools' directory for your own consu
 * Removed the deprecated tools.  This includes atf-config, atf-report,
   atf-run and atf-version.
 
+* Issue #8: Fixed atf-c/macros_test:use test failures spotted by the clang
+  that ships with FreeBSD 11.0-CURRENT.
+
 
 Changes in version 0.19
 ***********************

Modified: head/contrib/atf/atf-c/macros_h_test.c
==============================================================================
--- head/contrib/atf/atf-c/macros_h_test.c	Fri Sep 19 16:06:54 2014	(r271874)
+++ head/contrib/atf/atf-c/macros_h_test.c	Fri Sep 19 17:18:27 2014	(r271875)
@@ -87,6 +87,7 @@ ATF_TC(TEST_MACRO_1);
 ATF_TC_HEAD(TEST_MACRO_1, tc) { if (tc != NULL) {} }
 ATF_TC_BODY(TEST_MACRO_1, tc) { if (tc != NULL) {} }
 atf_tc_t *test_name_1 = &ATF_TC_NAME(TEST_MACRO_1);
+atf_tc_pack_t *test_pack_1 = &ATF_TC_PACK_NAME(TEST_MACRO_1);
 void (*head_1)(atf_tc_t *) = ATF_TC_HEAD_NAME(TEST_MACRO_1);
 void (*body_1)(const atf_tc_t *) = ATF_TC_BODY_NAME(TEST_MACRO_1);
 ATF_TC_WITH_CLEANUP(TEST_MACRO_2);
@@ -94,10 +95,12 @@ ATF_TC_HEAD(TEST_MACRO_2, tc) { if (tc !
 ATF_TC_BODY(TEST_MACRO_2, tc) { if (tc != NULL) {} }
 ATF_TC_CLEANUP(TEST_MACRO_2, tc) { if (tc != NULL) {} }
 atf_tc_t *test_name_2 = &ATF_TC_NAME(TEST_MACRO_2);
+atf_tc_pack_t *test_pack_2 = &ATF_TC_PACK_NAME(TEST_MACRO_2);
 void (*head_2)(atf_tc_t *) = ATF_TC_HEAD_NAME(TEST_MACRO_2);
 void (*body_2)(const atf_tc_t *) = ATF_TC_BODY_NAME(TEST_MACRO_2);
 void (*cleanup_2)(const atf_tc_t *) = ATF_TC_CLEANUP_NAME(TEST_MACRO_2);
 ATF_TC_WITHOUT_HEAD(TEST_MACRO_3);
 ATF_TC_BODY(TEST_MACRO_3, tc) { if (tc != NULL) {} }
 atf_tc_t *test_name_3 = &ATF_TC_NAME(TEST_MACRO_3);
+atf_tc_pack_t *test_pack_3 = &ATF_TC_PACK_NAME(TEST_MACRO_3);
 void (*body_3)(const atf_tc_t *) = ATF_TC_BODY_NAME(TEST_MACRO_3);