Skip to content

Commit

Permalink
Merge pull request #3 from TheLonelyGhost/fix-makefile
Browse files Browse the repository at this point in the history
Converts start/stop scripts for server into make directives
  • Loading branch information
greyblake committed Aug 6, 2016
2 parents ccf8f72 + c102cd9 commit e81af90
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 42 deletions.
27 changes: 24 additions & 3 deletions Makefile
@@ -1,6 +1,27 @@
test: test_unit test_acceptance
.PHONY: test
test: test_unit test_acceptance clean

test_acceptance:
./spec/support/scripts/run_acceptance_tests
.PHONY: test_acceptance
test_acceptance: tmp/server.pid
crystal spec $$(find ./spec/acceptance/ -name '*_spec.cr')

.PHONY: test_unit
test_unit:
crystal spec $$(find ./spec/unit/ -name '*_spec.cr')

tmp/server: tmp/
crystal build ./spec/support/server.cr -o ./tmp/server

tmp/:
mkdir -p ./tmp

tmp/server.pid: tmp/server
./tmp/server -p 3999 > ./tmp/server.log & echo $$! >> ./tmp/server.pid

.PHONY: clean
clean: stop_server
rm -rf ./tmp

.PHONY: stop_server
stop_server:
[ -e ./tmp/server.pid ] && $$(ps $$(cat ./tmp/server.pid) | grep -q $$(cat ./tmp/server.pid)) && kill $$(cat ./tmp/server.pid) || true
13 changes: 0 additions & 13 deletions spec/support/scripts/run_acceptance_tests

This file was deleted.

21 changes: 0 additions & 21 deletions spec/support/scripts/start_server

This file was deleted.

5 changes: 0 additions & 5 deletions spec/support/scripts/stop_server

This file was deleted.

0 comments on commit e81af90

Please sign in to comment.