fixes for non interactive execution

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14472 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/console/console.cpp b/samples/console/console.cpp
index f2c3a63aa3cf6dde2edaaac203889fa919c14f6a..b0062a69cc6f0090ca4d90a5d9d344db98ade9fc 100644 (file)
--- a/samples/console/console.cpp
+++ b/samples/console/console.cpp
@@ -99,7 +99,7 @@
 #ifdef TEST_INTERACTIVE
     #undef TEST_INTERACTIVE
 
 #ifdef TEST_INTERACTIVE
     #undef TEST_INTERACTIVE
 

-    static const bool TEST_INTERACTIVE = FALSE;
+    static const bool TEST_INTERACTIVE = TRUE;

 #else
     static const bool TEST_INTERACTIVE = FALSE;
 #endif
 #else
     static const bool TEST_INTERACTIVE = FALSE;
 #endif


@@ -1947,8 +1947,15 @@ static void TestDivision()
         // multiplication will not overflow)
         wxLongLong ll = MAKE_LL((rand() >> 12), rand(), rand(), rand());
 
         // multiplication will not overflow)
         wxLongLong ll = MAKE_LL((rand() >> 12), rand(), rand(), rand());
 

-        // get a random long (not wxLongLong for now) to divide it with
-        long l = rand();
+        // get a random (but non null) long (not wxLongLong for now) to divide
+        // it with
+        long l;
+        do
+        {
+           l = rand();
+        }
+        while ( !l );
+

         q = ll / l;
         r = ll % l;
 
         q = ll / l;
         r = ll % l;
 


@@ -5692,7 +5699,9 @@ int main(int argc, char **argv)
     {
         TestOsInfo();
         TestUserInfo();
     {
         TestOsInfo();
         TestUserInfo();

-        TestDiskInfo();
+
+        if ( TEST_INTERACTIVE )
+            TestDiskInfo();

     }
 #endif // TEST_INFO_FUNCTIONS
 
     }
 #endif // TEST_INFO_FUNCTIONS