aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2012-11-17 16:57:30 +0000
committerJonathan McCrohan <jmccrohan@gmail.com>2012-11-17 16:57:30 +0000
commitf2499612c5594944d3e0891259859668d35c85b2 (patch)
tree0672f579db91cfaca7a2935a86991fa67b5aae59 /tests
parent429e46051dba814e7d6c74368eb1bba550222cbe (diff)
downloadlibconfig-f2499612c5594944d3e0891259859668d35c85b2.tar.gz
Imported Upstream version 1.4.9upstream/1.4.9
Diffstat (limited to '')
-rw-r--r--tests/Makefile.in2
-rw-r--r--tests/tests.c14
2 files changed, 11 insertions, 5 deletions
diff --git a/tests/Makefile.in b/tests/Makefile.in
index c9f388f..ecf67de 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -115,6 +115,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
NM = @NM@
NMEDIT = @NMEDIT@
@@ -142,6 +143,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
diff --git a/tests/tests.c b/tests/tests.c
index 298c402..e13e67f 100644
--- a/tests/tests.c
+++ b/tests/tests.c
@@ -20,10 +20,14 @@
----------------------------------------------------------------------------
*/
+#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
#include <sys/stat.h>
+#ifdef _MSC_VER
+#define snprintf _snprintf
+#endif
+
#include <libconfig.h>
#include <tinytest.h>
@@ -48,7 +52,7 @@ static void parse_and_compare(const char *input_file, const char *output_file)
remove("temp.cfg");
TT_ASSERT_TRUE(config_write_file(&cfg, "temp.cfg"));
- TT_ASSERT_FILE_EQ("temp.cfg", output_file);
+ TT_ASSERT_TXTFILE_EQ("temp.cfg", output_file);
remove("temp.cfg");
config_destroy(&cfg);
@@ -135,7 +139,7 @@ TT_TEST(ParsingAndFormatting)
sprintf(output_file, "testdata/output_%d.cfg", i);
printf("parsing %s\n", input_file);
- if((access(input_file, F_OK) != 0) || (access(output_file, F_OK) != 0))
+ if(!tt_file_exists(input_file) || !tt_file_exists(output_file))
break;
parse_and_compare(input_file, output_file);
@@ -157,7 +161,7 @@ TT_TEST(ParseInvalidFiles)
sprintf(input_file, "testdata/bad_input_%d.cfg", i);
sprintf(error_file, "testdata/parse_error_%d.txt", i);
- if((access(input_file, F_OK) != 0) || (access(error_file, F_OK) != 0))
+ if(!tt_file_exists(input_file) || !tt_file_exists(error_file))
break;
fp = fopen(error_file, "rt");
@@ -185,7 +189,7 @@ TT_TEST(ParseInvalidStrings)
sprintf(input_file, "testdata/bad_input_%d.cfg", i);
sprintf(error_file, "testdata/parse_error_%d.txt", i);
- if((access(input_file, F_OK) != 0) || (access(error_file, F_OK) != 0))
+ if(!tt_file_exists(input_file) || !tt_file_exists(error_file))
break;
input_text = read_file_to_string(input_file);