aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/unix/squishInstall.sh
diff options
context:
space:
mode:
Diffstat (limited to 'coin/provisioning/common/unix/squishInstall.sh')
-rwxr-xr-xcoin/provisioning/common/unix/squishInstall.sh44
1 files changed, 31 insertions, 13 deletions
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh
index 04ce9b93..327c8af5 100755
--- a/coin/provisioning/common/unix/squishInstall.sh
+++ b/coin/provisioning/common/unix/squishInstall.sh
@@ -41,19 +41,20 @@ set -ex
# This script will fetch and extract pre-buildt squish package for Linux and Mac.
# Squish is need by Release Test Automation (RTA)
-version="6.6.1"
-qtBranch="515x"
+version="6.7-20210119-1632"
+qtBranch="60x"
installFolder="/opt"
squishFolder="$installFolder/squish"
preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable"
-licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license"
+licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license"
licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a"
if uname -a |grep -q Darwin; then
- compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz"
+ version="6.6.1"
+ compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz"
sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae"
else
compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz"
- sha1="3a50052caafa3ca583b7edf754227999d7185ffa"
+ sha1="8780665c3560456cd86980802cb24513233444fe"
fi
mountFolder="/tmp/squish"
@@ -100,7 +101,8 @@ sudo mv "$installFolder/rta_squish_$version" "$squishFolder"
if uname -a |grep -q "Ubuntu"; then
if [ ! -e "/usr/lib/tcl8.6" ]; then
sudo mkdir /usr/lib/tcl8.6
- sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
+ #this needs to be copied only to squish_for_qt6
+ sudo cp "$squishFolder/squish_for_qt6/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
fi
fi
@@ -112,18 +114,34 @@ sudo chown qt:$usersGroup "$HOME/.squish-3-license"
echo "Set commands for environment variables in .bashrc"
if uname -a |grep -q "Ubuntu"; then
- echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile
- echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile
+ echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile
+ echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile
else
echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc
echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc
fi
-echo "Verifying Squish"
-if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
- echo "Squish for Qt installation tested successfully"
+echo "Verifying Squish, available installations:"
+ls -la $squishFolder
+if uname -a |grep -q Darwin; then
+ if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+ echo "Squish for Qt installation tested successfully"
+ else
+ echo "Squish for Qt test failed! Package wasn't installed correctly."
+ exit 1
+ fi
else
- echo "Squish for Qt test failed! Package wasn't installed correctly."
- exit 1
+ if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+ echo "Squish for Qt5 installation tested successfully"
+ else
+ echo "Squish for Qt5 test failed! Package wasn't installed correctly."
+ exit 1
+ fi
+ if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then
+ echo "Squish for Qt6 installation tested successfully"
+ else
+ echo "Squish for Qt6 test failed! Package wasn't installed correctly."
+ exit 1
+ fi
fi