[ntdll/tests] Skip most tests on Windows Vista (Resend)

Paul Vriens paul.vriens.wine at gmail.com
Tue Jan 9 12:49:26 CST 2007


Hi,

anything wrong with this one?

Before starting to fix up the framework (already sent a patch) to cope with
Vista, the size of the results file has to be reduced (it's now
12MB!).

RtlUniform and RtlRandom behave totally different and accumulate 10.5
MB of trace output. (locale stuff btw. is a good contributor as well).

This patch skips these tests on Vista until that's figured out.

Changelog
 Skip most tests on Windows Vista

Cheers,

Paul
---
 dlls/ntdll/tests/rtl.c |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
index 8a5611c..cdbf8d7 100644
--- a/dlls/ntdll/tests/rtl.c
+++ b/dlls/ntdll/tests/rtl.c
@@ -330,9 +330,21 @@ static void test_RtlUniform(void)
     seed = 2;
     expected = seed * 0xffffffed + 0x7fffffc3;
     result = pRtlUniform(&seed);
+
+/*
+ * Windows Vista uses different algorithms, so skip the rest of the tests
+ * until that is figured out. Trace output for the failures is about 10.5 MB!
+ */
+
+    if (result == 0x7fffff9f) {
+        trace("Most likely running on Windows Vista, skipping rest of tests\n");
+        return;
+    }
+
     ok(result == expected,
         "RtlUniform(&seed (seed == 2)) returns %x, expected %x\n",
         result, expected);
+
 /*
  * More tests show that if seed is odd the result must be incremented by 1:
  */
@@ -616,6 +628,17 @@ static void test_RtlRandom(void)
     result_expected = 0x320a1743;
     seed_expected =0x44b;
     result = pRtlRandom(&seed);
+
+/*
+ * Windows Vista uses different algorithms, so skip the rest of the tests
+ * until that is figured out. Trace output for the failures is about 10.5 MB!
+ */
+
+    if (seed == 0x3fc) {
+        trace("Most likely running on Windows Vista, skipping rest of tests\n");
+        return;
+    }
+
     ok(result == result_expected,
         "pRtlRandom(&seed (seed == 0)) returns %x, expected %x\n",
         result, result_expected);
-- 
1.4.4.4




More information about the wine-patches mailing list