From: Martin Willi Date: Tue, 4 Mar 2014 13:00:11 +0000 (+0100) Subject: unit-tests: Adapt settings tests for Windows X-Git-Tag: 5.2.0dr6~24^2~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74e14ea5472694ed645475f7946e731c1b27482c;p=thirdparty%2Fstrongswan.git unit-tests: Adapt settings tests for Windows --- diff --git a/src/libstrongswan/tests/suites/test_settings.c b/src/libstrongswan/tests/suites/test_settings.c index 97e45fc04e..32676be26a 100644 --- a/src/libstrongswan/tests/suites/test_settings.c +++ b/src/libstrongswan/tests/suites/test_settings.c @@ -22,7 +22,11 @@ #include #include +#ifdef WIN32 +static char *path = "C:\\Windows\\Temp\\strongswan-settings-test"; +#else static char *path = "/tmp/strongswan-settings-test"; +#endif static settings_t *settings; static void create_settings(chunk_t contents) @@ -522,8 +526,13 @@ START_TEST(test_key_value_enumerator) } END_TEST -#define include1 "/tmp/strongswan-settings-test-include1" -#define include2 "/tmp/strongswan-settings-test-include2" +#ifdef WIN32 +# define include1 "C:\\Windows\\Temp\\strongswan-settings-test-include1" +# define include2 "C:\\Windows\\Temp\\strongswan-settings-test-include2" +#else +# define include1 "/tmp/strongswan-settings-test-include1" +# define include2 "/tmp/strongswan-settings-test-include2" +#endif START_SETUP(setup_include_config) { @@ -675,6 +684,7 @@ START_TEST(test_load_files_section) ck_assert(!settings->load_files_section(settings, include1".conf", TRUE, "")); verify_include(); +#ifndef WIN32 /* unreadable files are too (only fails when not running as root) */ if (getuid() != 0) { @@ -683,6 +693,7 @@ START_TEST(test_load_files_section) unlink(include1".no"); verify_include(); } +#endif ck_assert(settings->load_files_section(settings, include2, FALSE, "main")); verify_null("main.key1");