Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 18:16:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added selection of branch from combo.

Browse source
This commit is contained in:
NissimHadar 2018-06-18 07:44:04 -07:00
parent afba9c0c5b
commit d59ddc4764
2 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/auto-tester/src/Test.cpp
View file

@ -411,13 +411,15 @@ void Test::createRecursiveScript(const QString& topLevelDirectory, bool interact
textStream << "// This is an automatically generated file, created by auto-tester on " << QDateTime::currentDateTime().toString(DATE_TIME_FORMAT) << endl << endl; textStream << "// This is an automatically generated file, created by auto-tester on " << QDateTime::currentDateTime().toString(DATE_TIME_FORMAT) << endl << endl;
textStream << "user = \"" + GIT_HUB_USER + "/\";" << endl; textStream << "user = \"" + GIT_HUB_USER + "/\";" << endl;
textStream << "repository = \"" + GIT_HUB_REPOSITORY + "/\";" << endl; textStream << "repository = \"" + GIT_HUB_REPOSITORY + "/\";" << endl << endl;
QString branch = autoTester->getSelectedBranch(); textStream << "Script.include(\"https://github.com/highfidelity/hifi_tests/blob/RC69/tests/utils/branchUtils.js?raw=true\");" << endl;
textStream << "branch = \"" + branch + "/\";" << endl << endl; textStream << "branch = getBranch(Script.resolvePath(\".\"), repository) +\"/\";" << endl << endl;
// Wait 10 seconds before starting // Wait 10 seconds before starting
textStream << "Test.wait(10000);" << endl << endl; textStream << "if (typeof Test !== 'undefined') {" << endl;
textStream << " Test.wait(10000);" << endl;
textStream << "};" << endl << endl;
textStream << "var repositoryPath = \"https://github.com/\" + user + repository + \"blob/\" + branch;" << endl; textStream << "var repositoryPath = \"https://github.com/\" + user + repository + \"blob/\" + branch;" << endl;
textStream << "var autoTester = Script.require(repositoryPath + \"tests/utils/autoTester.js?raw=true\");" << endl << endl; textStream << "var autoTester = Script.require(repositoryPath + \"tests/utils/autoTester.js?raw=true\");" << endl << endl;

42
tools/auto-tester/src/ui/AutoTester.ui
View file

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>607</width> <width>583</width>
<height>514</height> <height>514</height>
</rect> </rect>
</property> </property>
@ -17,9 +17,9 @@
<widget class="QPushButton" name="closeButton"> <widget class="QPushButton" name="closeButton">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>360</x> <x>460</x>
<y>400</y> <y>410</y>
<width>220</width> <width>101</width>
<height>40</height> <height>40</height>
</rect> </rect>
</property> </property>
@ -43,7 +43,7 @@
<widget class="QPushButton" name="evaluateTestsButton"> <widget class="QPushButton" name="evaluateTestsButton">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>340</x> <x>330</x>
<y>275</y> <y>275</y>
<width>220</width> <width>220</width>
<height>40</height> <height>40</height>
@ -56,8 +56,8 @@
<widget class="QPushButton" name="createRecursiveScriptButton"> <widget class="QPushButton" name="createRecursiveScriptButton">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>340</x> <x>330</x>
<y>95</y> <y>30</y>
<width>220</width> <width>220</width>
<height>40</height> <height>40</height>
</rect> </rect>
@ -69,8 +69,8 @@
<widget class="QCheckBox" name="checkBoxInteractiveMode"> <widget class="QCheckBox" name="checkBoxInteractiveMode">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>343</x> <x>330</x>
<y>240</y> <y>250</y>
<width>131</width> <width>131</width>
<height>20</height> <height>20</height>
</rect> </rect>
@ -85,7 +85,7 @@
<widget class="QProgressBar" name="progressBar"> <widget class="QProgressBar" name="progressBar">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>340</x> <x>330</x>
<y>330</y> <y>330</y>
<width>255</width> <width>255</width>
<height>23</height> <height>23</height>
@ -98,8 +98,8 @@
<widget class="QPushButton" name="createAllRecursiveScriptsButton"> <widget class="QPushButton" name="createAllRecursiveScriptsButton">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>340</x> <x>330</x>
<y>160</y> <y>80</y>
<width>220</width> <width>220</width>
<height>40</height> <height>40</height>
</rect> </rect>
@ -112,7 +112,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>80</y> <y>100</y>
<width>220</width> <width>220</width>
<height>40</height> <height>40</height>
</rect> </rect>
@ -125,7 +125,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>130</y> <y>150</y>
<width>220</width> <width>220</width>
<height>40</height> <height>40</height>
</rect> </rect>
@ -138,7 +138,7 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>20</x>
<y>180</y> <y>220</y>
<width>220</width> <width>220</width>
<height>40</height> <height>40</height>
</rect> </rect>
@ -176,8 +176,8 @@
<widget class="QComboBox" name="branchComboBox"> <widget class="QComboBox" name="branchComboBox">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>428</x> <x>418</x>
<y>41</y> <y>211</y>
<width>131</width> <width>131</width>
<height>31</height> <height>31</height>
</rect> </rect>
@ -186,10 +186,10 @@
<widget class="QLabel" name="label"> <widget class="QLabel" name="label">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>340</x> <x>330</x>
<y>30</y> <y>220</y>
<width>81</width> <width>81</width>
<height>51</height> <height>16</height>
</rect> </rect>
</property> </property>
<property name="font"> <property name="font">
@ -207,7 +207,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>607</width> <width>583</width>
<height>21</height> <height>21</height>
</rect> </rect>
</property> </property>