From: KonaBlend <kona8lend@gmail.com>
Date: Sun, 27 Mar 2016 18:45:19 +0000 (-0400)
Subject: Fix --print-config to show pch_defines
X-Git-Tag: v3.2.5~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b91cc44e35775c2a1a69b61f5890245eb6586986;p=thirdparty%2Fccache.git

Fix --print-config to show pch_defines
---

diff --git a/conf.c b/conf.c
index e8bd523d3..0179e2d4f 100644
--- a/conf.c
+++ b/conf.c
@@ -607,6 +607,9 @@ conf_print_items(struct conf *conf,
 	if (conf->sloppiness & SLOPPY_TIME_MACROS) {
 		reformat(&s, "%stime_macros, ", s);
 	}
+	if (conf->sloppiness & SLOPPY_PCH_DEFINES) {
+		reformat(&s, "%spch_defines, ", s);
+	}
 	if (conf->sloppiness & SLOPPY_FILE_STAT_MATCHES) {
 		reformat(&s, "%sfile_stat_matches, ", s);
 	}
diff --git a/test/test_conf.c b/test/test_conf.c
index df344c553..780d64f41 100644
--- a/test/test_conf.c
+++ b/test/test_conf.c
@@ -116,7 +116,7 @@ TEST(conf_read_valid_config)
 	  "read_only_direct = true\n"
 	  "recache = true\n"
 	  "run_second_cpp = true\n"
-	  "sloppiness =     file_macro   ,time_macros,  include_file_mtime,include_file_ctime,file_stat_matches  pch_defines  \n"
+	  "sloppiness =     file_macro   ,time_macros,  include_file_mtime,include_file_ctime,file_stat_matches, pch_defines  \n"
 	  "stats = false\n"
 	  "temporary_dir = ${USER}_foo\n"
 	  "umask = 777\n"
@@ -369,7 +369,7 @@ TEST(conf_print_items)
 		true,
 		SLOPPY_FILE_MACRO|SLOPPY_INCLUDE_FILE_MTIME|
 		SLOPPY_INCLUDE_FILE_CTIME|SLOPPY_TIME_MACROS|
-		SLOPPY_FILE_STAT_MATCHES,
+		SLOPPY_FILE_STAT_MATCHES|SLOPPY_PCH_DEFINES,
 		false,
 		"td",
 		022,
@@ -408,7 +408,8 @@ TEST(conf_print_items)
 	CHECK_STR_EQ("recache = true", received_conf_items[n++].descr);
 	CHECK_STR_EQ("run_second_cpp = true", received_conf_items[n++].descr);
 	CHECK_STR_EQ("sloppiness = file_macro, include_file_mtime,"
-	             " include_file_ctime, time_macros, file_stat_matches",
+	             " include_file_ctime, time_macros, pch_defines,"
+	             " file_stat_matches",
 	             received_conf_items[n++].descr);
 	CHECK_STR_EQ("stats = false", received_conf_items[n++].descr);
 	CHECK_STR_EQ("temporary_dir = td", received_conf_items[n++].descr);