diff options
| author | Jack Lloyd <[email protected]> | 2018-01-09 10:07:31 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2018-01-09 10:07:31 -0500 |
| commit | 92749094c285d14a683b490042d79a960991490c (patch) | |
| tree | f31e6c7a144c2f8c1ac2b8e323de7c5c0a819f71 /src/tests | |
| parent | d220c13939be5102b7916d36c1031b77a07f972c (diff) | |
| parent | f0575ecf644a583afb491d14df1f7b03dae7bd32 (diff) | |
Merge GH #1378 Use OS feature flags instead of OS name for enabling system specific code
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/test_os_utils.cpp | 4 | ||||
| -rw-r--r-- | src/tests/test_rng.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/tests/test_os_utils.cpp b/src/tests/test_os_utils.cpp index 6707e8960..1c159ca75 100644 --- a/src/tests/test_os_utils.cpp +++ b/src/tests/test_os_utils.cpp @@ -55,8 +55,8 @@ class OS_Utils_Tests final : public Test result.test_eq("PID same across calls", static_cast<size_t>(pid1), static_cast<size_t>(pid2)); -#if defined(BOTAN_TARGET_OS_TYPE_IS_UNIKERNEL) - result.test_eq("PID is zero on unikernel systems", pid1, 0); +#if defined(BOTAN_TARGET_OS_IS_INCLUDEOS) || defined(BOTAN_TARGET_OS_IS_LLVM) + result.test_eq("PID is expected to be zero on this platform", pid1, 0); #else result.test_ne("PID is non-zero on systems with processes", pid1, 0); #endif diff --git a/src/tests/test_rng.cpp b/src/tests/test_rng.cpp index 193a94379..a7a83134f 100644 --- a/src/tests/test_rng.cpp +++ b/src/tests/test_rng.cpp @@ -37,7 +37,7 @@ #include <botan/entropy_src.h> #endif -#if defined(BOTAN_TARGET_OS_TYPE_IS_UNIX) +#if defined(BOTAN_TARGET_OS_HAS_POSIX1) #include <unistd.h> #include <sys/wait.h> #endif @@ -273,7 +273,7 @@ class Stateful_RNG_Tests : public Test { Test::Result result(rng_name() + " Fork Safety"); -#if defined(BOTAN_TARGET_OS_TYPE_IS_UNIX) +#if defined(BOTAN_TARGET_OS_HAS_POSIX1) const size_t reseed_interval = 1024; // make sure rng is reseeded after every fork |