Changeset 209 for tests

Timestamp:

Oct 6, 2009, 6:13:43 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

tests: Play Qt rules in order to get separate output directories for object files (needed after discarding r200).

Location:

tests

Files:

• common.pri (modified) (1 diff)
• process/process (modified) (1 prop)
• process/process/process.cpp (modified) (6 diffs)
• process/test (modified) (1 prop)

tests/common.pri

@@ -1 +1 @@
 isEmpty(DEPTH):DEPTH = .
-os2:OBJECTS_DIR = $$DEPTH/obj/os2
-win32:OBJECTS_DIR = $$DEPTH/obj/win
-x11:OBJECTS_DIR = $$DEPTH/obj/x11
 
+os2:PLATFORM        = os2
+else:win32:PLATFORM = win
+else:x11:PLATFORM   = x11
+else:PLATFORM       = unk
+
+# in debug_and_release, we need a -debug or -release suffix to get separate
+# output paths (it will be replaced with the correct one at runtime)
+debug_and_release:OUTPATH_SUFFIX = -debug
+else:OUTPATH_SUFFIX =
+
+OBJECTS_DIR = $$DEPTH/obj/$${PLATFORM}$${OUTPATH_SUFFIX}
 MOC_DIR = $$OBJECTS_DIR
 DESTDIR = $$OBJECTS_DIR
 
+# target.path isn't there by default
 QMAKE_DIR_REPLACE = OBJECTS_DIR MOC_DIR RCC_DIR target.path
 
-#release {
-#    os2:target.path = $$DEPTH/bin/os2-release
-#    win32:target.path = $$DEPTH/bin/os2-release
-#    x11:target.path = $$DEPTH/bin/os2-release
-
-os2:target.path = $$DEPTH/bin/os2
-win32:target.path = $$DEPTH/bin/win
-x11:target.path = $$DEPTH/bin/x11
-
+target.path = $$DEPTH/bin/$${PLATFORM}$${OUTPATH_SUFFIX}
 INSTALLS += target

tests/process/process

@@ -1 +1 @@
 Makefile
 Makefile.*
+vc*.pdb

@@ -1 +1 @@
 Makefile
 Makefile.*
+vc*.pdb

tests/process/process/process.cpp

@@ -21 +21 @@
 public:
 
-    MyWidget(QWidget *aParent) : QWidget(aParent)
+    MyWidget(QWidget *aParent)
+        : QWidget(aParent), mOtherProcess(0), mRedirectedToOtherProcess(false)
     {
         // children
@@ -74 +75 @@
     }
 
+    QProcess *process() const { return mProcess; }
+    void setOtherProcess(QProcess *aOtherProcess) { mOtherProcess = aOtherProcess; }
+
 private slots:
 
@@ -200 +204 @@
                 return;
             }
+
+            if (!mRedirectedToOtherProcess)
+            {
+                mRedirectedToOtherProcess = true;
+                mProcess->setStandardOutputProcess(mOtherProcess);
+                mEditor->append(tr("> Redirected standard output to standard "
+                                   "input of another process"));
+            }
+            else
+            {
+                mRedirectedToOtherProcess = false;
+                mProcess->setStandardErrorFile(QString::null);
+                mEditor->append(tr("> Canceled redirection of standard output"));
+            }
         }
         else
@@ -266 +284 @@
 
     QProcess *mProcess;
+    QProcess *mOtherProcess;
+    bool mRedirectedToOtherProcess;
+
     QTextEdit *mEditor;
     QLineEdit *mLineEdit;
@@ -284 +305 @@
 
         QTabWidget *tabs = new QTabWidget();
-        tabs->addTab(new MyWidget(tabs), QLatin1String("Process 1"));
-        tabs->addTab(new MyWidget(tabs), QLatin1String("Process 2"));
+
+        mWidget1 = new MyWidget(tabs);
+        mWidget2 = new MyWidget(tabs);
+
+        mWidget1->setOtherProcess(mWidget2->process());
+        mWidget2->setOtherProcess(mWidget1->process());
+
+        tabs->addTab(mWidget1, QLatin1String("Process 1"));
+        tabs->addTab(mWidget2, QLatin1String("Process 2"));
 
         // connections
@@ -302 +330 @@
         // other
     }
+
+private:
+
+    MyWidget *mWidget1;
+    MyWidget *mWidget2;
 };
 

tests/process/test

@@ -1 +1 @@
 Makefile
 Makefile.*
+vc*.pdb

@@ -1 +1 @@
 Makefile
 Makefile.*
+vc*.pdb

@@ -1 +1 @@
 Makefile
 Makefile.*
+vc*.pdb

@@ -1 +1 @@
 Makefile
 Makefile.*
+vc*.pdb