diff options
| author | Joel Rosdahl <joel@rosdahl.net> | 2014-01-08 21:28:40 +0100 |
|---|---|---|
| committer | Joel Rosdahl <joel@rosdahl.net> | 2014-01-08 21:28:40 +0100 |
| commit | c0b40b8b634ff966a097598447317a9f7754a53a (patch) | |
| tree | 25186ecc5cac13c2b7bed51e01ea90cd88337660 /test | |
| parent | b08fc595b03676b0da807498e034588e08030a99 (diff) | |
| parent | 708d9110a103bd49437be7bff1e82697fff68d0b (diff) | |
| download | ccache-c0b40b8b634ff966a097598447317a9f7754a53a.tar.gz | |
Merge branch 'maint'
* maint:
Require CCACHE_SLOPPINESS=pch_defines,time_macros opt-in to enable PCH handling
doc: Mention that --ccache-skip currently does not mean "skip hashing option"
Don't hash compiler option -fdebug-prefix-map=
Conflicts:
MANUAL.txt
ccache.c
ccache.h
test.sh
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_conf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/test_conf.c b/test/test_conf.c index c06a66a8..30bfe432 100644 --- a/test/test_conf.c +++ b/test/test_conf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011-2013 Joel Rosdahl + * Copyright (C) 2011-2014 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,include_file_ctime,file_stat_matches \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" @@ -145,7 +145,7 @@ TEST(conf_read_valid_config) 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_STAT_MATCHES|SLOPPY_PCH_DEFINES, conf->sloppiness); CHECK(!conf->stats); CHECK_STR_EQ_FREE1(format("%s_foo", user), conf->temporary_dir); |