diff options
author | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 09:50:31 -0400 |
---|---|---|
committer | Mike DePaulo <mikedep333@gmail.com> | 2015-03-28 13:13:13 -0400 |
commit | 91e3957fb0e38a5d5649f82e5d9f89dd0e85666f (patch) | |
tree | fe0992fb4cf6f3c2a5d597557552ae69caccbe70 /openssl/test/testutil.h | |
parent | 9073d97eff3f6d3b33450ef3532a826674c7e1e8 (diff) | |
download | vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.tar.gz vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.tar.bz2 vcxsrv-91e3957fb0e38a5d5649f82e5d9f89dd0e85666f.zip |
Update openssl to version openssl-1.0.1m
Conflicts:
openssl/Makefile
openssl/Makefile.bak
openssl/crypto/cryptlib.c
Diffstat (limited to 'openssl/test/testutil.h')
-rw-r--r-- | openssl/test/testutil.h | 58 |
1 files changed, 30 insertions, 28 deletions
diff --git a/openssl/test/testutil.h b/openssl/test/testutil.h index 3e9cb8401..75f0c8ae0 100644 --- a/openssl/test/testutil.h +++ b/openssl/test/testutil.h @@ -1,5 +1,5 @@ /* test/testutil.h */ -/* +/*- * Utilities for writing OpenSSL unit tests. * * More information: @@ -57,9 +57,10 @@ */ #ifndef HEADER_TESTUTIL_H -#define HEADER_TESTUTIL_H +# define HEADER_TESTUTIL_H -/* SETUP_TEST_FIXTURE and EXECUTE_TEST macros for test case functions. +/*- + * SETUP_TEST_FIXTURE and EXECUTE_TEST macros for test case functions. * * SETUP_TEST_FIXTURE will call set_up() to create a new TEST_FIXTURE_TYPE * object called "fixture". It will also allocate the "result" variable used @@ -83,34 +84,35 @@ * Then test case functions can take the form: * * static int test_foobar_feature() - * { - * SETUP_FOOBAR_TEST_FIXTURE(); - * [...set individual members of fixture...] - * EXECUTE_FOOBAR_TEST(); - * } + * { + * SETUP_FOOBAR_TEST_FIXTURE(); + * [...set individual members of fixture...] + * EXECUTE_FOOBAR_TEST(); + * } */ -#define SETUP_TEST_FIXTURE(TEST_FIXTURE_TYPE, set_up)\ - TEST_FIXTURE_TYPE fixture = set_up(TEST_CASE_NAME);\ - int result = 0 +# define SETUP_TEST_FIXTURE(TEST_FIXTURE_TYPE, set_up)\ + TEST_FIXTURE_TYPE fixture = set_up(TEST_CASE_NAME);\ + int result = 0 -#define EXECUTE_TEST(execute_func, tear_down)\ - if (execute_func(fixture) != 0) result = 1;\ - tear_down(fixture);\ - return result +# define EXECUTE_TEST(execute_func, tear_down)\ + if (execute_func(fixture) != 0) result = 1;\ + tear_down(fixture);\ + return result -/* TEST_CASE_NAME is defined as the name of the test case function where +/* + * TEST_CASE_NAME is defined as the name of the test case function where * possible; otherwise we get by with the file name and line number. */ -#if __STDC_VERSION__ < 199901L -#if defined(_MSC_VER) -#define TEST_CASE_NAME __FUNCTION__ -#else -#define testutil_stringify_helper(s) #s -#define testutil_stringify(s) testutil_stringify_helper(s) -#define TEST_CASE_NAME __FILE__ ":" testutil_stringify(__LINE__) -#endif /* _MSC_VER */ -#else -#define TEST_CASE_NAME __func__ -#endif /* __STDC_VERSION__ */ +# if __STDC_VERSION__ < 199901L +# if defined(_MSC_VER) +# define TEST_CASE_NAME __FUNCTION__ +# else +# define testutil_stringify_helper(s) #s +# define testutil_stringify(s) testutil_stringify_helper(s) +# define TEST_CASE_NAME __FILE__ ":" testutil_stringify(__LINE__) +# endif /* _MSC_VER */ +# else +# define TEST_CASE_NAME __func__ +# endif /* __STDC_VERSION__ */ -#endif /* HEADER_TESTUTIL_H */ +#endif /* HEADER_TESTUTIL_H */ |