From: Joel Rosdahl <joel@rosdahl.net>
Date: Sat, 2 Mar 2013 20:06:31 +0000 (+0100)
Subject: Fix test_conf unit tests after b291647878eb3eaa331cb34cab361788231de074
X-Git-Tag: v3.2~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b10b91e1eefc22e368880c1b6297c0348d4d6c79;p=thirdparty%2Fccache.git

Fix test_conf unit tests after b291647878eb3eaa331cb34cab361788231de074
---

diff --git a/test/test_conf.c b/test/test_conf.c
index b06e477ac..c06a66a83 100644
--- a/test/test_conf.c
+++ b/test/test_conf.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011-2012 Joel Rosdahl
+ * Copyright (C) 2011-2013 Joel Rosdahl
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -114,7 +114,7 @@ TEST(conf_read_valid_config)
 		"read_only = true\n"
 		"recache = true\n"
 		"run_second_cpp = true\n"
-		"sloppiness =     file_macro   ,time_macros,  include_file_mtime  \n"
+		"sloppiness =     file_macro   ,time_macros,  include_file_mtime,include_file_ctime,file_stat_matches  \n"
 		"stats = false\n"
 		"temporary_dir = ${USER}_foo\n"
 		"umask = 777\n"
@@ -144,8 +144,8 @@ TEST(conf_read_valid_config)
 	CHECK(conf->recache);
 	CHECK(conf->run_second_cpp);
 	CHECK_INT_EQ(SLOPPY_INCLUDE_FILE_MTIME|SLOPPY_INCLUDE_FILE_CTIME|
-		     SLOPPY_FILE_MACRO|SLOPPY_TIME_MACROS|
-		     SLOPPY_FILE_STAT_MATCHES,
+	             SLOPPY_FILE_MACRO|SLOPPY_TIME_MACROS|
+	             SLOPPY_FILE_STAT_MATCHES,
 	             conf->sloppiness);
 	CHECK(!conf->stats);
 	CHECK_STR_EQ_FREE1(format("%s_foo", user), conf->temporary_dir);
@@ -362,7 +362,6 @@ TEST(conf_print_items)
 		true,
 		true,
 		SLOPPY_FILE_MACRO|SLOPPY_INCLUDE_FILE_MTIME|
-		  SLOPPY_INCLUDE_FILE_CTIME|SLOPPY_TIME_MACROS,
 		  SLOPPY_INCLUDE_FILE_CTIME|SLOPPY_TIME_MACROS|
 		  SLOPPY_FILE_STAT_MATCHES,
 		false,
@@ -401,7 +400,8 @@ TEST(conf_print_items)
 	CHECK_STR_EQ("read_only = true", received_conf_items[n++].descr);
 	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, time_macros",
+	CHECK_STR_EQ("sloppiness = file_macro, include_file_mtime,"
+	             " include_file_ctime, time_macros, 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);