Changeset 925

Timestamp:

Aug 1, 2011, 3:20:02 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

tests/process: Added stderr load test.

Location:

tests/process/process-sync

Files:

• process-sync-test.cmd (modified) (1 diff)
• process-sync.cpp (modified) (3 diffs)

tests/process/process-sync/process-sync-test.cmd

@@ -20 +20 @@
   /* run */
   '@del bigfile.txt.out 1>nul 2>nul'
-  'process-sync.exe read bigfile.txt'
+  'process-sync.exe read_out bigfile.txt'
   /* compare results */
   'comp bigfile.txt bigfile.txt.out < n'
+  if (rc \= 0) then do
+    say 'ERROR: rc = 'rc' (i = 'i')'
+    signal done
+  end
+end
+
+do i = 1 to 100
+  /* run */
+  '@del bigfile.txt.err 1>nul 2>nul'
+  'process-sync.exe read_err bigfile.txt'
+  /* compare results */
+  'comp bigfile.txt bigfile.txt.err < n'
   if (rc \= 0) then do
     say 'ERROR: rc = 'rc' (i = 'i')'

tests/process/process-sync/process-sync.cpp

@@ -57 +57 @@
 }
 
-int test_read(const QString &aFile)
-{
-    printf ("test_read: Read '%s' from child's stdout " 
-            "and write it to '%s.out'\n", aFile.toLocal8Bit().constData(),
-            aFile.toLocal8Bit().constData());
-
-    QString aOutFile = aFile + ".out";
+int test_read(const QString &aFile, bool aToStdErr)
+{
+    const char *ext = aToStdErr ? "err" : "out";
+
+    printf ("test_read: Read '%s' from child's std%s "
+            "and write it to '%s.%s'\n", aFile.toLocal8Bit().constData(),
+            ext, aFile.toLocal8Bit().constData(), ext);
+
+    QString aOutFile = aFile + "." + ext;
     QProcess p;
     QFile f (aOutFile);
 
+    p.setReadChannel (aToStdErr ? QProcess::StandardError :
+                                  QProcess::StandardOutput);
+
     if (f.open (QIODevice::WriteOnly))
     {
         p.start ("child",
-                 QStringList() << "1" << aFile,
+                 QStringList() << (aToStdErr ? "2" : "1") << aFile,
                  QIODevice::ReadOnly);
 
@@ -207 +212 @@
     if (argc == 3)
     {
-        if (qstrcmp (argv [1], "read") == 0)
-                return test_read (QLatin1String (argv [2]));
-        if (qstrcmp (argv [1], "write") == 0)
+        if (qstrcmp (argv [1], "read_out") == 0)
+            return test_read (QLatin1String (argv [2]), false);
+        if (qstrcmp (argv [1], "read_err") == 0)
+            return test_read (QLatin1String (argv [2]), true);
+        if (qstrcmp (argv [1], "write") == 0)
                 return test_write(QLatin1String (argv [2]));
         }
@@ -225 +232 @@
     }
 
-    printf ("Usage: testcase read|write <filename>\n"
+    printf ("Usage: testcase read_out|read_err|write <filename>\n"
             "       testcase sleep|hang\n");