Skip to content

Commit 1b25669

Browse files
committed
PHPC-234: Run test suite automatically on FreeBSD 10.1
1 parent 7dfc4c0 commit 1b25669

File tree

4 files changed

+22
-5
lines changed

4 files changed

+22
-5
lines changed

Makefile.frag

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ test-bootstrap:
8989
distcheck: package test-virtual
9090

9191
test-virtual: package
92+
sh ./scripts/run-tests-on.sh freebsd
9293
sh ./scripts/run-tests-on.sh precise32
9394
sh ./scripts/run-tests-on.sh precise64
9495

Vagrantfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ Vagrant.configure(2) do |config|
88
config.vm.provider "vmware_workstation" do |vmware, override|
99
vmware.vmx["memsize"] = "8192"
1010
vmware.vmx["numvcpus"] = "2"
11-
override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
1211
end
1312

1413
config.vm.define "mo", primary: true do |mo|
@@ -17,6 +16,7 @@ Vagrant.configure(2) do |config|
1716
mo.vm.box = "http://files.vagrantup.com/precise64.box"
1817
mo.vm.provider "vmware_workstation" do |vmware, override|
1918
override.vm.box_url = 'http://files.vagrantup.com/precise64_vmware.box'
19+
override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
2020
end
2121

2222
mo.vm.provision "shell", path: "scripts/ubuntu/essentials.sh", privileged: true
@@ -30,6 +30,7 @@ Vagrant.configure(2) do |config|
3030
ldap.vm.box = "http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box"
3131
ldap.vm.provider "vmware_workstation" do |vmware, override|
3232
override.vm.box_url = "https://dl.dropbox.com/u/5721940/vagrant-boxes/vagrant-centos-6.4-x86_64-vmware_fusion.box"
33+
override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
3334
end
3435

3536
ldap.vm.provision "shell", path: "scripts/centos/essentials.sh", privileged: true
@@ -42,6 +43,9 @@ Vagrant.configure(2) do |config|
4243
bsd.vm.box = "geoffgarside/freebsd-10.0"
4344

4445
bsd.vm.provision "shell", path: "scripts/freebsd/essentials.sh", privileged: true
46+
bsd.vm.provision "file", source: "/tmp/PHONGO-SERVERS.json", destination: "/tmp/PHONGO-SERVERS.json"
47+
bsd.vm.provision "file", source: "scripts/configs/.gdbinit", destination: "/home/vagrant/.gdbinit"
48+
bsd.vm.provision "shell", path: "scripts/freebsd/phongo.sh", privileged: true
4549
bsd.vm.synced_folder ".", "/phongo", :nfs => true, id: "vagrant-root"
4650
end
4751

@@ -51,6 +55,7 @@ Vagrant.configure(2) do |config|
5155
linux.vm.box = "http://files.vagrantup.com/precise64.box"
5256
linux.vm.provider "vmware_workstation" do |vmware, override|
5357
override.vm.box_url = 'http://files.vagrantup.com/precise64_vmware.box'
58+
override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
5459
end
5560

5661
linux.vm.provision "shell", path: "scripts/ubuntu/essentials.sh", privileged: true
@@ -65,6 +70,7 @@ Vagrant.configure(2) do |config|
6570
linux.vm.box = "bjori/precise32"
6671
linux.vm.provider "vmware_workstation" do |vmware, override|
6772
override.vm.box_url = "bjori/precise32"
73+
override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
6874
end
6975

7076
linux.vm.provision "shell", path: "scripts/ubuntu/essentials.sh", privileged: true

scripts/freebsd/essentials.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Update ports
2-
sudo portsnap fetch extract
2+
sudo portsnap fetch extract update
33

44
# Minimum required PHP install + pecl
5-
sudo pkg install pcre php56 php56-openssl php56-json pear autoconf cyrus-sasl
5+
sudo pkg install -y pcre php56 php56-openssl php56-json pear autoconf pkgconf cyrus-sasl
66

77
# We need vim. git requires curl. mongoc requires libtool and automake
8-
sudo pkg install vim git curl libtool automake
8+
sudo pkg install -y vim git curl libtool automake
99

1010
# I can't stand emacs
11-
echo 'set -o vi' | sudo tee /etc/profile.d/vishell.sh
11+
echo 'set -o vi' | sudo tee -a /etc/profile
1212

1313

scripts/freebsd/phongo.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
ls -1 /phongo/mongodb*.tgz | sort -n -r | xargs sudo pecl install -f 2>&1 > /phongo/.build
2+
if test $? -eq 0; then
3+
php -m | grep -q mongodb || echo "extension=mongodb.so" | sudo tee -a /usr/local/etc/php/extensions.ini
4+
pecl run-tests -q -p mongodb 2>&1 > /phongo/.tests
5+
else
6+
tail -n50 /phongo/.build
7+
exit 3
8+
fi
9+
10+

0 commit comments

Comments
 (0)