Permalink
Browse files

Merge pull request #87 from BytemarkHosting/stretch-ruby2.3

Stretch ruby2.3
  • Loading branch information...
patch0 committed Aug 14, 2017
2 parents 0561015 + 57d530d commit 02ed14c03de7a944238bb2bfd9203ade2fdc6480
Showing with 10 additions and 2 deletions.
  1. +4 −1 dns/Makefile
  2. +1 −0 httpd/Makefile
  3. +5 −1 monit/Makefile
@@ -7,7 +7,7 @@ man/%.man: ./sbin/%

docs: man/symbiosis-dns-generate.man

test: test1.9.1 test2.0 test2.1
test: test1.9.1 test2.0 test2.1 test2.3

test1.9.1:
[ -z "`which ruby1.9.1`" ] || ruby1.9.1 ../common/bin/symbiosis-test test.d
@@ -18,6 +18,9 @@ test2.0:
test2.1:
[ -z "`which ruby2.1`" ] || ruby2.1 ../common/bin/symbiosis-test test.d

test2.3:
[ -z "`which ruby2.3`" ] || ruby2.3 ../common/bin/symbiosis-test test.d

clean:
$(RM) -r man

@@ -12,6 +12,7 @@ docs: man/symbiosis-httpd-configure.man man/symbiosis-httpd-logger.man man/symb
test:
$(MAKE) -C vhost-alias test
[ -z "`which ruby2.1`" ] || ruby2.1 -I ../common/lib -I lib/ test.d/t*.rb
[ -z "`which ruby2.3`" ] || ruby2.3 -I ../common/lib -I lib/ test.d/t*.rb

.PHONY: test clean all docs

@@ -13,7 +13,7 @@ man: man/symbiosis-monit.man

docs: man/symbiosis-monit.man doc/index.html

test: test1.9.1 test2.1
test: test1.9.1 test2.1 test2.3

test1.9.1:
cd test.d
@@ -23,6 +23,10 @@ test2.1:
cd test.d
[ -z "`which ruby2.1`" ] || (cd test.d && ruby2.1 -I . ts_monit.rb)

test2.3:
cd test.d
[ -z "`which ruby2.3`" ] || (cd test.d && ruby2.3 -I . ts_monit.rb)

clean:
$(RM) man/symbiosis-monit.man
$(RM) -r man/

0 comments on commit 02ed14c

Please sign in to comment.