Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-10-06 20:49:34 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2016-10-21 07:54:02 (GMT) |
| commit | 223bdbe232d42e459d4e1b840fe91486e5b4b733 (patch) | |
| tree | f6b5e245bdba0b7a58d30a97df41f242b4c7c58d /QA/CrossDistributionTest/VagrantCrossDistributionTest.py | |
| parent | da871d063e4c24d64317b5a2df69a59e3b60c9b7 (diff) | |
| download | swift-223bdbe232d42e459d4e1b840fe91486e5b4b733.zip swift-223bdbe232d42e459d4e1b840fe91486e5b4b733.tar.bz2 | |
Fix version number for libminiupnpc version switch
Test-Information:
Without this building failed under Gentoo Linux distribution.
Verified this on Sabayon, a desktop Linux distribution based
on Gentoo, by adding it to our cross distribution test.
With this fix it builds on all platforms, including Sabayon.
Change-Id: I23aec19b9755244dd3dbe6f581cf170eaf334dfc
Diffstat (limited to 'QA/CrossDistributionTest/VagrantCrossDistributionTest.py')
| -rwxr-xr-x | QA/CrossDistributionTest/VagrantCrossDistributionTest.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/QA/CrossDistributionTest/VagrantCrossDistributionTest.py b/QA/CrossDistributionTest/VagrantCrossDistributionTest.py index ed0639c..3530fe5 100755 --- a/QA/CrossDistributionTest/VagrantCrossDistributionTest.py +++ b/QA/CrossDistributionTest/VagrantCrossDistributionTest.py @@ -1,82 +1,87 @@ #!/usr/bin/env python # Required Python libraries: # # pip install python-vagrant tqdm # # Purpose of this script: # # This script tests # a) InstallSwiftDependencies.sh installs all required packages for Swift and Swiften on system and # b) all Swift projects build successfully on the system and their tests pass. from tqdm import tqdm from time import sleep import sys import vagrant testSystems = [ "bento/ubuntu-16.04", "bento/ubuntu-15.04", "bento/debian-8.5", "bento/opensuse-leap-42.1", "bento/fedora-24", + "Sabayon/spinbase-amd64" ] progressBar = tqdm(testSystems) successfulSystems = [] failedSystems = [] for testSystem in progressBar : v = vagrant.Vagrant(quiet_stdout=False) try : progressBar.set_description("create Vagrantfile for %s" % testSystem) with open('Vagrantfile', 'w') as vagrantfile : vagrantfile.write(""" Vagrant.configure("2") do |config| config.vm.box = "%s" config.ssh.insert_key = false config.vm.provider "virtualbox" do |v| - v.memory = 3072 + v.memory = 4096 v.cpus = 2 end # This is needed because Fedora only comes with Python 3 and Ansible needs Python 2 # on the target system for some features. if config.vm.box.include? "fedora" config.vm.provision "shell", inline: "sudo dnf install -y python2 python2-dnf libselinux-python" end + if config.vm.box.include? "Sabayon" + config.vm.provision "shell", inline: "sudo equo update && sudo env ACCEPT_LICENSE=* equo install dev-vcs/git sys-apps/lsb-release" + end + config.vm.synced_folder "../..", "/home/vagrant/swift-host", type: "rsync" config.vm.synced_folder ".", "/vagrant", type: "rsync" config.vm.provision "ansible" do |ansible| #ansible.verbose = "vvv" ansible.playbook = "playbook.yml" end end""" % testSystem) progressBar.set_description("vagrant up") v.up(testSystem, provision=True ) progressBar.set_description("start building swift on %s" % testSystem) # unset QTDIR is needed, because Fedora 24 sets QTDIR to Qt 3, even though Qt 5 is installed. # SCons will pick up the Qt installation from QTDIR if QTDIR is set. v._call_vagrant_command(["ssh", "-c", "cd /home/vagrant/swift && unset QTDIR && ./scons test=unit -j 2"]) progressBar.set_description("vagrant destory %s" % testSystem) v.destroy() successfulSystems.append(testSystem) except : e = sys.exc_info()[0] print("Exception: %s" % e) progressBar.set_description("vagrant destory %s" % testSystem) v.destroy() failedSystems.append(testSystem) for system in successfulSystems: print("SUCCESS: %s" % system) for system in failedSystems: |