oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

make test_config work again

Browse Source
This commit is contained in:
Love Hornquist Astrand
2010-11-26 12:28:45 -08:00
parent 1c400805f6
commit 24d628edf3
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/krb5/Makefile.am
View File

@@ -44,6 +44,8 @@ TESTS = \
test_pknistkdf \ test_pknistkdf \
test_time test_time
check_DATA = test_config_strings.out
check_PROGRAMS = $(TESTS) test_hostname test_ap-req check_PROGRAMS = $(TESTS) test_hostname test_ap-req
LDADD = libkrb5.la \ LDADD = libkrb5.la \
@@ -338,6 +340,7 @@ build_HEADERZ = \
krb_err.h krb_err.h
CLEANFILES = \ CLEANFILES = \
test_config_strings.out \
test-store-data \ test-store-data \
krb5_err.c krb5_err.h \ krb5_err.c krb5_err.h \
krb_err.c krb_err.h \ krb_err.c krb_err.h \
@@ -346,6 +349,9 @@ CLEANFILES = \
$(libkrb5_la_OBJECTS): krb5_err.h krb_err.h heim_err.h k524_err.h crypto.h $(libkrb5_la_OBJECTS): krb5_err.h krb_err.h heim_err.h k524_err.h crypto.h
test_config_strings.out: test_config_strings.cfg
$(CP) $(srcdir)/test_config_strings.cfg test_config_strings.out
EXTRA_DIST = \ EXTRA_DIST = \
krb5_err.et \ krb5_err.et \
krb_err.et \ krb_err.et \
@@ -353,6 +359,7 @@ EXTRA_DIST = \
k524_err.et \ k524_err.et \
$(man_MANS) \ $(man_MANS) \
version-script.map \ version-script.map \
test_config_strings.cfg \
krb5.moduli krb5.moduli
#sysconf_DATA = krb5.moduli #sysconf_DATA = krb5.moduli

4
lib/krb5/NTMakefile
View File

@@ -436,9 +436,9 @@ test_binaries = \
test-binaries: $(test_binaries) test-binaries: $(test_binaries)
test-files: $(OBJ)\test_config_strings.cfg test-files: $(OBJ)\test_config_strings.out
$(OBJ)\test_config_strings.cfg: test_config_strings.cfg $(OBJ)\test_config_strings.out: test_config_strings.cfg
$(CP) $** $@ $(CP) $** $@
test-run: test-run:

8
lib/krb5/test_config.c
View File

@@ -96,7 +96,7 @@ struct {
{ "", NULL } { "", NULL }
}; };
void static void
check_config_files(void) check_config_files(void)
{ {
krb5_context context; krb5_context context;
@@ -186,7 +186,7 @@ const struct {
{ "longer_strings", config_string_result10 } { "longer_strings", config_string_result10 }
}; };
void static void
check_escaped_strings(void) check_escaped_strings(void)
{ {
krb5_context context; krb5_context context;
@@ -198,7 +198,7 @@ check_escaped_strings(void)
if (ret) if (ret)
errx(1, "krb5_init_context %d", ret); errx(1, "krb5_init_context %d", ret);
ret = krb5_config_parse_file(context, "test_config_strings.cfg", &c); ret = krb5_config_parse_file(context, "test_config_strings.out", &c);
if (ret) if (ret)
krb5_errx(context, 1, "krb5_config_parse_file()"); krb5_errx(context, 1, "krb5_config_parse_file()");
@@ -214,7 +214,7 @@ check_escaped_strings(void)
e = config_strings_tests[i].expected; e = config_strings_tests[i].expected;
for (s = ps; *s && *e; s++, e++) { for (s = (const char **)ps; *s && *e; s++, e++) {
if (strcmp(*s, *e)) if (strcmp(*s, *e))
errx(1, errx(1,
"Unexpected configuration string at value [%s].\n" "Unexpected configuration string at value [%s].\n"