From 8375a33d4a6eb2be497a1e320b066ca30fab4be3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 11 Apr 2018 15:32:53 +0300 Subject: Fix squish provisioning script typo Change-Id: If33847a552fe40128cef577b99adf3152de3a9e2 Reviewed-by: Oswald Buddenhagen --- coin/provisioning/common/unix/squishInstall.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'coin/provisioning/common/unix/squishInstall.sh') diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 069d5afd..b160b9ea 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -140,10 +140,10 @@ echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile - echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.profile + echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile else echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc - echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.bashrc + echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc fi echo "Installing squish license to home directory.." -- cgit v1.2.3 From 83f2a25f17020d8ff626ebf961d98e7cdcff5c26 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 14 Feb 2018 15:48:58 +0200 Subject: Provisioning: Add test for squish installation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squish is needed by RTA which is not run during normal qt5 build. Other words squish installation is not tested during integration. That's why we need separate test for it. This change will fetch test and run test suite which is made to check that squish installation works Task-number: QTQAINFRA-1733 Change-Id: I9284fd52d87767ae04022c3a6996e0bb972315dd Reviewed-by: Johanna Äijälä Reviewed-by: Joni Jäntti Reviewed-by: Matti Paaso --- coin/provisioning/common/unix/squishInstall.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'coin/provisioning/common/unix/squishInstall.sh') diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index b160b9ea..0ed9b0a0 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -51,6 +51,9 @@ fi squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" squishLicenseFile=".squish-3-license.tar.gz" +testSuite="suite_test_squish" +testSuiteUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" + # These checks can be removed when Vanilla OS for all linux and Mac are in if [ -d "$squishFolder" ]; then echo "Move old squish to /tmp" @@ -151,3 +154,14 @@ MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile" echo "Installing squish $version.." MountAndInstall "$squishUrl" "$squishFolder" "$squishFile" + +echo "Installing test suite for squish" +MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz" + +echo "Verifying Squish Installation" +if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/$testSuite" | grep "Squish test run successfully" ; then + echo "Squish installation tested successfully" +else + echo "Squish test failed! Package wasn't installed correctly." + exit 1 +fi -- cgit v1.2.3