File tree Expand file tree Collapse file tree 3 files changed +39
-4
lines changed Expand file tree Collapse file tree 3 files changed +39
-4
lines changed Original file line number Diff line number Diff line change 25
25
@echo -e "\t$$ make composer"
26
26
@echo -e "\t - Installs test dependencies using composer"
27
27
28
+ @echo ""
29
+ @echo -e "\t$$ make distcheck"
30
+ @echo -e "\t - Builds the archive, runs the virtual tests"
28
31
@echo ""
29
32
@echo -e "\t$$ make release"
30
- @echo -e "\t - Runs the tests and creates the pecl archive on success"
33
+ @echo -e "\t - Packages the archive, runs the tests locally and virtual"
34
+
35
+ @echo ""
36
+ @echo -e "\t$$ make package"
37
+ @echo -e "\t - Creates the pecl archive to use for provisioning"
38
+ @echo -e "\t$$ make test-virtual"
39
+ @echo -e "\t - Provisions some VMs, installs the pecl archive and executes the tests"
31
40
32
41
33
42
mv-coverage :
@@ -77,6 +86,12 @@ list-servers:
77
86
test-bootstrap :
78
87
php scripts/start-servers.php
79
88
89
+ distcheck : package test-virtual
90
+
91
+ test-virtual : package
92
+ sh ./scripts/run-tests-on.sh precise32
93
+ sh ./scripts/run-tests-on.sh precise64
94
+
80
95
testunit : composer
81
96
@command -v phpunit > /dev/null 2>&1 ; \
82
97
if test $$ ? -eq 0; then \
@@ -103,7 +118,7 @@ testclean:
103
118
104
119
mongodbdep :
105
120
106
- release : test package
121
+ release : test distcheck
107
122
@echo " Please run:"
108
123
@echo " " git add RELEASE-$(MONGODB_VERSION )
109
124
@echo " " git commit -m \" Add $(MONGODB_VERSION ) release notes\"
Original file line number Diff line number Diff line change
1
+ #! /bin/sh
2
+
3
+ VMNAME=$1
4
+
5
+ vagrant status $VMNAME | grep -q " $VMNAME .*running"
6
+ if test $? -eq 0; then
7
+ vagrant provision $VMNAME > .$VMNAME
8
+ else
9
+ vagrant up $VMNAME > .$VMNAME
10
+ fi
11
+
12
+ cat .tests | grep -q -E " FAIL|WARN"
13
+ if test $? -eq 0; then
14
+ echo " $VMNAME FAILED"
15
+ cat .tests
16
+ exit 2
17
+ else
18
+ echo " $VMNAME OK"
19
+ fi
20
+
Original file line number Diff line number Diff line change 1
1
apt-get install -y php-pear php5-dbg gdb
2
2
apt-get install -y libssl-dev libsasl2-dev libpcre3-dev pkg-config
3
3
4
- ls -1 /phongo/mongodb* .tgz | sort -n -r | xargs sudo pecl install -f
4
+ ls -1 /phongo/mongodb* .tgz | sort -n -r | xargs sudo pecl install -f 2>&1 > /phongo/.build
5
5
php -m | grep -q mongodb || echo " extension=mongodb.so" >> ` php --ini | grep " Loaded Configuration" | sed -e " s|.*:\s*||" `
6
- pecl run-tests -q -p mongodb
6
+ pecl run-tests -q -p mongodb 2>&1 > /phongo/.tests
You can’t perform that action at this time.
0 commit comments