diff options
author | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2018-06-23 15:23:33 +0200 |
---|---|---|
committer | Anders F Björklund <anders.f.bjorklund@gmail.com> | 2018-06-23 18:07:57 +0200 |
commit | d257047384018f1e66ec233583fe1aa06b86123b (patch) | |
tree | bb295a602650bc7e3fca1f6491e8ef1dbe1e4ae1 | |
parent | 4e8c0c53d15a68b622aa6e0169e6d9496d9141f1 (diff) | |
download | ccache-d257047384018f1e66ec233583fe1aa06b86123b.tar.gz |
Add config for debug option ($CCACHE_DEBUG)
-rw-r--r-- | doc/MANUAL.adoc | 5 | ||||
-rw-r--r-- | src/conf.c | 4 | ||||
-rw-r--r-- | src/conf.h | 1 | ||||
-rw-r--r-- | src/confitems.gperf | 49 | ||||
-rw-r--r-- | src/confitems_lookup.c | 152 | ||||
-rw-r--r-- | src/envtoconfitems.gperf | 1 | ||||
-rw-r--r-- | src/envtoconfitems_lookup.c | 60 | ||||
-rw-r--r-- | unittest/test_conf.c | 5 |
8 files changed, 148 insertions, 129 deletions
diff --git a/doc/MANUAL.adoc b/doc/MANUAL.adoc index eeab0be2..3bdfa9f6 100644 --- a/doc/MANUAL.adoc +++ b/doc/MANUAL.adoc @@ -350,6 +350,11 @@ WRAPPERS>>. compiled, but that sometimes doesn't work. For example, when using the ``aCC'' compiler on HP-UX, set the cpp extension to *i*. +*debug* (*CCACHE_DEBUG* or *CCACHE_NODEBUG*, see <<_boolean_values,Boolean values>> above):: + + If true, the debug mode will be used. The default is false. In debug mode, + the hash input and the log file will be stored next to the object file. + *direct_mode* (*CCACHE_DIRECT* or *CCACHE_NODIRECT*, see <<_boolean_values,Boolean values>> above):: If true, the direct mode will be used. The default is true. See @@ -328,6 +328,7 @@ conf_create(void) conf->compression = false; conf->compression_level = 6; conf->cpp_extension = x_strdup(""); + conf->debug = false; conf->direct_mode = true; conf->disable = false; conf->extra_files_to_hash = x_strdup(""); @@ -568,6 +569,9 @@ conf_print_items(struct conf *conf, reformat(&s, "cpp_extension = %s", conf->cpp_extension); printer(s, conf->item_origins[find_conf("cpp_extension")->number], context); + reformat(&s, "debug = %s", bool_to_string(conf->debug)); + printer(s, conf->item_origins[find_conf("debug")->number], context); + reformat(&s, "direct_mode = %s", bool_to_string(conf->direct_mode)); printer(s, conf->item_origins[find_conf("direct_mode")->number], context); @@ -12,6 +12,7 @@ struct conf { bool compression; unsigned compression_level; char *cpp_extension; + bool debug; bool direct_mode; bool disable; char *extra_files_to_hash; diff --git a/src/confitems.gperf b/src/confitems.gperf index eef78c5f..7fd8ab96 100644 --- a/src/confitems.gperf +++ b/src/confitems.gperf @@ -15,27 +15,28 @@ compiler_check, 4, ITEM(compiler_check, string) compression, 5, ITEM(compression, bool) compression_level, 6, ITEM(compression_level, unsigned) cpp_extension, 7, ITEM(cpp_extension, string) -direct_mode, 8, ITEM(direct_mode, bool) -disable, 9, ITEM(disable, bool) -extra_files_to_hash, 10, ITEM(extra_files_to_hash, env_string) -hard_link, 11, ITEM(hard_link, bool) -hash_dir, 12, ITEM(hash_dir, bool) -ignore_headers_in_manifest, 13, ITEM(ignore_headers_in_manifest, env_string) -keep_comments_cpp, 14, ITEM(keep_comments_cpp, bool) -limit_multiple, 15, ITEM(limit_multiple, float) -log_file, 16, ITEM(log_file, env_string) -max_files, 17, ITEM(max_files, unsigned) -max_size, 18, ITEM(max_size, size) -path, 19, ITEM(path, env_string) -pch_external_checksum, 20, ITEM(pch_external_checksum, bool) -prefix_command, 21, ITEM(prefix_command, env_string) -prefix_command_cpp, 22, ITEM(prefix_command_cpp, env_string) -read_only, 23, ITEM(read_only, bool) -read_only_direct, 24, ITEM(read_only_direct, bool) -recache, 25, ITEM(recache, bool) -run_second_cpp, 26, ITEM(run_second_cpp, bool) -sloppiness, 27, ITEM(sloppiness, sloppiness) -stats, 28, ITEM(stats, bool) -temporary_dir, 29, ITEM(temporary_dir, env_string) -umask, 30, ITEM(umask, umask) -unify, 31, ITEM(unify, bool) +debug, 8, ITEM(debug, bool) +direct_mode, 9, ITEM(direct_mode, bool) +disable, 10, ITEM(disable, bool) +extra_files_to_hash, 11, ITEM(extra_files_to_hash, env_string) +hard_link, 12, ITEM(hard_link, bool) +hash_dir, 13, ITEM(hash_dir, bool) +ignore_headers_in_manifest, 14, ITEM(ignore_headers_in_manifest, env_string) +keep_comments_cpp, 15, ITEM(keep_comments_cpp, bool) +limit_multiple, 16, ITEM(limit_multiple, float) +log_file, 17, ITEM(log_file, env_string) +max_files, 18, ITEM(max_files, unsigned) +max_size, 19, ITEM(max_size, size) +path, 20, ITEM(path, env_string) +pch_external_checksum, 21, ITEM(pch_external_checksum, bool) +prefix_command, 22, ITEM(prefix_command, env_string) +prefix_command_cpp, 23, ITEM(prefix_command_cpp, env_string) +read_only, 24, ITEM(read_only, bool) +read_only_direct, 25, ITEM(read_only_direct, bool) +recache, 26, ITEM(recache, bool) +run_second_cpp, 27, ITEM(run_second_cpp, bool) +sloppiness, 28, ITEM(sloppiness, sloppiness) +stats, 29, ITEM(stats, bool) +temporary_dir, 30, ITEM(temporary_dir, env_string) +umask, 31, ITEM(umask, umask) +unify, 32, ITEM(unify, bool) diff --git a/src/confitems_lookup.c b/src/confitems_lookup.c index 04458d22..39660efc 100644 --- a/src/confitems_lookup.c +++ b/src/confitems_lookup.c @@ -31,7 +31,7 @@ #line 8 "src/confitems.gperf" struct conf_item; -/* maximum key range = 46, duplicates = 0 */ +/* maximum key range = 48, duplicates = 0 */ #ifdef __GNUC__ __inline @@ -45,32 +45,32 @@ confitems_hash (register const char *str, register unsigned int len) { static const unsigned char asso_values[] = { - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 0, 35, 0, - 5, 10, 50, 0, 30, 20, 50, 0, 10, 20, - 5, 0, 0, 50, 5, 0, 10, 15, 50, 50, - 20, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50 + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 0, 35, 0, + 0, 10, 52, 0, 30, 25, 52, 0, 10, 20, + 10, 0, 0, 52, 5, 5, 10, 15, 52, 52, + 15, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52, 52, 52, 52, 52, + 52, 52, 52, 52, 52, 52 }; return len + asso_values[(unsigned char)str[1]] + asso_values[(unsigned char)str[0]]; } @@ -87,19 +87,19 @@ confitems_get (register const char *str, register unsigned int len) { enum { - TOTAL_KEYWORDS = 32, + TOTAL_KEYWORDS = 33, MIN_WORD_LENGTH = 4, MAX_WORD_LENGTH = 26, MIN_HASH_VALUE = 4, - MAX_HASH_VALUE = 49 + MAX_HASH_VALUE = 51 }; static const struct conf_item wordlist[] = { {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL}, -#line 29 "src/confitems.gperf" - {"path", 19, ITEM(path, env_string)}, +#line 30 "src/confitems.gperf" + {"path", 20, ITEM(path, env_string)}, {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL}, #line 13 "src/confitems.gperf" @@ -114,65 +114,67 @@ confitems_get (register const char *str, register unsigned int len) {"cpp_extension", 7, ITEM(cpp_extension, string)}, #line 14 "src/confitems.gperf" {"compiler_check", 4, ITEM(compiler_check, string)}, -#line 38 "src/confitems.gperf" - {"stats", 28, ITEM(stats, bool)}, +#line 18 "src/confitems.gperf" + {"debug", 8, ITEM(debug, bool)}, #line 12 "src/confitems.gperf" {"cache_dir_levels", 2, ITEM_V(cache_dir_levels, unsigned, dir_levels)}, #line 16 "src/confitems.gperf" {"compression_level", 6, ITEM(compression_level, unsigned)}, -#line 26 "src/confitems.gperf" - {"log_file", 16, ITEM(log_file, env_string)}, -#line 31 "src/confitems.gperf" - {"prefix_command", 21, ITEM(prefix_command, env_string)}, -#line 37 "src/confitems.gperf" - {"sloppiness", 27, ITEM(sloppiness, sloppiness)}, -#line 30 "src/confitems.gperf" - {"pch_external_checksum", 20, ITEM(pch_external_checksum, bool)}, -#line 35 "src/confitems.gperf" - {"recache", 25, ITEM(recache, bool)}, +#line 27 "src/confitems.gperf" + {"log_file", 17, ITEM(log_file, env_string)}, #line 32 "src/confitems.gperf" - {"prefix_command_cpp", 22, ITEM(prefix_command_cpp, env_string)}, + {"prefix_command", 22, ITEM(prefix_command, env_string)}, +#line 39 "src/confitems.gperf" + {"stats", 29, ITEM(stats, bool)}, +#line 31 "src/confitems.gperf" + {"pch_external_checksum", 21, ITEM(pch_external_checksum, bool)}, +#line 36 "src/confitems.gperf" + {"recache", 26, ITEM(recache, bool)}, #line 33 "src/confitems.gperf" - {"read_only", 23, ITEM(read_only, bool)}, -#line 41 "src/confitems.gperf" - {"unify", 31, ITEM(unify, bool)}, + {"prefix_command_cpp", 23, ITEM(prefix_command_cpp, env_string)}, +#line 34 "src/confitems.gperf" + {"read_only", 24, ITEM(read_only, bool)}, +#line 38 "src/confitems.gperf" + {"sloppiness", 28, ITEM(sloppiness, sloppiness)}, {"",0,NULL,0,NULL}, -#line 24 "src/confitems.gperf" - {"keep_comments_cpp", 14, ITEM(keep_comments_cpp, bool)}, +#line 25 "src/confitems.gperf" + {"keep_comments_cpp", 15, ITEM(keep_comments_cpp, bool)}, +#line 29 "src/confitems.gperf" + {"max_size", 19, ITEM(max_size, size)}, #line 28 "src/confitems.gperf" - {"max_size", 18, ITEM(max_size, size)}, -#line 27 "src/confitems.gperf" - {"max_files", 17, ITEM(max_files, unsigned)}, + {"max_files", 18, ITEM(max_files, unsigned)}, +#line 42 "src/confitems.gperf" + {"unify", 32, ITEM(unify, bool)}, +#line 35 "src/confitems.gperf" + {"read_only_direct", 25, ITEM(read_only_direct, bool)}, +#line 20 "src/confitems.gperf" + {"disable", 10, ITEM(disable, bool)}, +#line 40 "src/confitems.gperf" + {"temporary_dir", 30, ITEM(temporary_dir, env_string)}, +#line 37 "src/confitems.gperf" + {"run_second_cpp", 27, ITEM(run_second_cpp, bool)}, {"",0,NULL,0,NULL}, -#line 34 "src/confitems.gperf" - {"read_only_direct", 24, ITEM(read_only_direct, bool)}, #line 19 "src/confitems.gperf" - {"disable", 9, ITEM(disable, bool)}, -#line 39 "src/confitems.gperf" - {"temporary_dir", 29, ITEM(temporary_dir, env_string)}, -#line 36 "src/confitems.gperf" - {"run_second_cpp", 26, ITEM(run_second_cpp, bool)}, - {"",0,NULL,0,NULL}, -#line 18 "src/confitems.gperf" - {"direct_mode", 8, ITEM(direct_mode, bool)}, + {"direct_mode", 9, ITEM(direct_mode, bool)}, {"",0,NULL,0,NULL}, +#line 23 "src/confitems.gperf" + {"hash_dir", 13, ITEM(hash_dir, bool)}, #line 22 "src/confitems.gperf" - {"hash_dir", 12, ITEM(hash_dir, bool)}, -#line 21 "src/confitems.gperf" - {"hard_link", 11, ITEM(hard_link, bool)}, -#line 40 "src/confitems.gperf" - {"umask", 30, ITEM(umask, umask)}, + {"hard_link", 12, ITEM(hard_link, bool)}, +#line 41 "src/confitems.gperf" + {"umask", 31, ITEM(umask, umask)}, {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL}, #line 10 "src/confitems.gperf" {"base_dir", 0, ITEM_V(base_dir, env_string, absolute_path)}, -#line 25 "src/confitems.gperf" - {"limit_multiple", 15, ITEM(limit_multiple, float)}, - {"",0,NULL,0,NULL}, -#line 23 "src/confitems.gperf" - {"ignore_headers_in_manifest", 13, ITEM(ignore_headers_in_manifest, env_string)}, +#line 21 "src/confitems.gperf" + {"extra_files_to_hash", 11, ITEM(extra_files_to_hash, env_string)}, {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL}, -#line 20 "src/confitems.gperf" - {"extra_files_to_hash", 10, ITEM(extra_files_to_hash, env_string)} + {"",0,NULL,0,NULL}, {"",0,NULL,0,NULL}, +#line 26 "src/confitems.gperf" + {"limit_multiple", 16, ITEM(limit_multiple, float)}, + {"",0,NULL,0,NULL}, +#line 24 "src/confitems.gperf" + {"ignore_headers_in_manifest", 14, ITEM(ignore_headers_in_manifest, env_string)} }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -189,4 +191,4 @@ confitems_get (register const char *str, register unsigned int len) } return 0; } -static const size_t CONFITEMS_TOTAL_KEYWORDS = 32; +static const size_t CONFITEMS_TOTAL_KEYWORDS = 33; diff --git a/src/envtoconfitems.gperf b/src/envtoconfitems.gperf index 47abe5e6..4d255190 100644 --- a/src/envtoconfitems.gperf +++ b/src/envtoconfitems.gperf @@ -17,6 +17,7 @@ COMPRESSLEVEL, "compression_level" CPP2, "run_second_cpp" COMMENTS, "keep_comments_cpp" DIR, "cache_dir" +DEBUG, "debug" DIRECT, "direct_mode" DISABLE, "disable" EXTENSION, "cpp_extension" diff --git a/src/envtoconfitems_lookup.c b/src/envtoconfitems_lookup.c index 16a905f9..b5afa695 100644 --- a/src/envtoconfitems_lookup.c +++ b/src/envtoconfitems_lookup.c @@ -52,8 +52,8 @@ envtoconfitems_hash (register const char *str, register unsigned int len) 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 0, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 25, 10, 0, 0, 15, - 10, 54, 5, 0, 54, 10, 35, 15, 0, 25, - 0, 54, 15, 20, 0, 54, 15, 54, 54, 0, + 10, 0, 5, 0, 54, 10, 35, 15, 0, 25, + 0, 54, 15, 20, 0, 0, 15, 54, 54, 0, 54, 54, 54, 54, 54, 5, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, @@ -101,7 +101,7 @@ envtoconfitems_get (register const char *str, register unsigned int len) { enum { - TOTAL_KEYWORDS = 33, + TOTAL_KEYWORDS = 34, MIN_WORD_LENGTH = 2, MAX_WORD_LENGTH = 15, MIN_HASH_VALUE = 2, @@ -117,77 +117,79 @@ envtoconfitems_get (register const char *str, register unsigned int len) {"DIR", "cache_dir"}, #line 17 "src/envtoconfitems.gperf" {"CPP2", "run_second_cpp"}, - {"",""}, {"",""}, -#line 41 "src/envtoconfitems.gperf" +#line 20 "src/envtoconfitems.gperf" + {"DEBUG", "debug"}, + {"",""}, +#line 42 "src/envtoconfitems.gperf" {"TEMPDIR", "temporary_dir"}, #line 13 "src/envtoconfitems.gperf" {"COMPILER", "compiler"}, -#line 32 "src/envtoconfitems.gperf" +#line 33 "src/envtoconfitems.gperf" {"PATH", "path"}, -#line 39 "src/envtoconfitems.gperf" +#line 40 "src/envtoconfitems.gperf" {"SLOPPINESS", "sloppiness"}, {"",""}, -#line 25 "src/envtoconfitems.gperf" +#line 26 "src/envtoconfitems.gperf" {"HASHDIR", "hash_dir"}, #line 14 "src/envtoconfitems.gperf" {"COMPILERCHECK", "compiler_check"}, -#line 27 "src/envtoconfitems.gperf" +#line 28 "src/envtoconfitems.gperf" {"LIMIT_MULTIPLE", "limit_multiple"}, -#line 43 "src/envtoconfitems.gperf" +#line 44 "src/envtoconfitems.gperf" {"UNIFY", "unify"}, -#line 34 "src/envtoconfitems.gperf" +#line 35 "src/envtoconfitems.gperf" {"PREFIX", "prefix_command"}, -#line 28 "src/envtoconfitems.gperf" - {"LOGFILE", "log_file"}, #line 29 "src/envtoconfitems.gperf" + {"LOGFILE", "log_file"}, +#line 30 "src/envtoconfitems.gperf" {"MAXFILES", "max_files"}, {"",""}, -#line 35 "src/envtoconfitems.gperf" +#line 36 "src/envtoconfitems.gperf" {"PREFIX_CPP", "prefix_command_cpp"}, -#line 20 "src/envtoconfitems.gperf" +#line 21 "src/envtoconfitems.gperf" {"DIRECT", "direct_mode"}, #line 11 "src/envtoconfitems.gperf" {"BASEDIR", "base_dir"}, #line 15 "src/envtoconfitems.gperf" {"COMPRESS", "compression"}, -#line 22 "src/envtoconfitems.gperf" +#line 23 "src/envtoconfitems.gperf" {"EXTENSION", "cpp_extension"}, -#line 40 "src/envtoconfitems.gperf" +#line 41 "src/envtoconfitems.gperf" {"STATS", "stats"}, {"",""}, -#line 30 "src/envtoconfitems.gperf" +#line 31 "src/envtoconfitems.gperf" {"MAXSIZE", "max_size"}, #line 16 "src/envtoconfitems.gperf" {"COMPRESSLEVEL", "compression_level"}, {"",""}, -#line 33 "src/envtoconfitems.gperf" +#line 34 "src/envtoconfitems.gperf" {"PCH_EXTSUM", "pch_external_checksum"}, {"",""}, -#line 38 "src/envtoconfitems.gperf" +#line 39 "src/envtoconfitems.gperf" {"RECACHE", "recache"}, -#line 36 "src/envtoconfitems.gperf" +#line 37 "src/envtoconfitems.gperf" {"READONLY", "read_only"}, {"",""}, -#line 42 "src/envtoconfitems.gperf" +#line 43 "src/envtoconfitems.gperf" {"UMASK", "umask"}, {"",""}, -#line 31 "src/envtoconfitems.gperf" +#line 32 "src/envtoconfitems.gperf" {"NLEVELS", "cache_dir_levels"}, #line 18 "src/envtoconfitems.gperf" {"COMMENTS", "keep_comments_cpp"}, {"",""}, -#line 37 "src/envtoconfitems.gperf" +#line 38 "src/envtoconfitems.gperf" {"READONLY_DIRECT", "read_only_direct"}, {"",""}, -#line 21 "src/envtoconfitems.gperf" +#line 22 "src/envtoconfitems.gperf" {"DISABLE", "disable"}, -#line 24 "src/envtoconfitems.gperf" +#line 25 "src/envtoconfitems.gperf" {"HARDLINK", "hard_link"}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, {"",""}, -#line 23 "src/envtoconfitems.gperf" +#line 24 "src/envtoconfitems.gperf" {"EXTRAFILES", "extra_files_to_hash"}, {"",""}, {"",""}, -#line 26 "src/envtoconfitems.gperf" +#line 27 "src/envtoconfitems.gperf" {"IGNOREHEADERS", "ignore_headers_in_manifest"} }; @@ -205,4 +207,4 @@ envtoconfitems_get (register const char *str, register unsigned int len) } return 0; } -static const size_t ENVTOCONFITEMS_TOTAL_KEYWORDS = 33; +static const size_t ENVTOCONFITEMS_TOTAL_KEYWORDS = 34; diff --git a/unittest/test_conf.c b/unittest/test_conf.c index 9271a88c..70072797 100644 --- a/unittest/test_conf.c +++ b/unittest/test_conf.c @@ -18,7 +18,7 @@ #include "framework.h" #include "util.h" -#define N_CONFIG_ITEMS 32 +#define N_CONFIG_ITEMS 33 static struct { char *descr; const char *origin; @@ -57,6 +57,7 @@ TEST(conf_create) CHECK(!conf->compression); CHECK_INT_EQ(6, conf->compression_level); CHECK_STR_EQ("", conf->cpp_extension); + CHECK(!conf->debug); CHECK(conf->direct_mode); CHECK(!conf->disable); CHECK_STR_EQ("", conf->extra_files_to_hash); @@ -394,6 +395,7 @@ TEST(conf_print_items) 8, "ce", false, + false, true, "efth", true, @@ -443,6 +445,7 @@ TEST(conf_print_items) CHECK_STR_EQ("compression = true", received_conf_items[n++].descr); CHECK_STR_EQ("compression_level = 8", received_conf_items[n++].descr); CHECK_STR_EQ("cpp_extension = ce", received_conf_items[n++].descr); + CHECK_STR_EQ("debug = false", received_conf_items[n++].descr); CHECK_STR_EQ("direct_mode = false", received_conf_items[n++].descr); CHECK_STR_EQ("disable = true", received_conf_items[n++].descr); CHECK_STR_EQ("extra_files_to_hash = efth", received_conf_items[n++].descr); |