THRIFT-3833 haxe http server implementation (by embeding into php web server)
Client: Haxe
Patch: Oleksii Prudkyi <Oleksii.Prudkyi@gmail.com> + some modifications by Jens Geyer
This closes #1013
This closes #1020
diff --git a/test/haxe/Makefile.am b/test/haxe/Makefile.am
index 6094452..1a32185 100644
--- a/test/haxe/Makefile.am
+++ b/test/haxe/Makefile.am
@@ -23,11 +23,12 @@
BIN_CPP = bin/Main-debug
BIN_PHP = bin/php/Main-debug.php
+BIN_PHP_WEB = bin/php-web-server/Main-debug.php
gen-haxe/thrift/test/ThriftTest.hx: $(THRIFTTEST)
$(THRIFTCMD) $(THRIFTTEST)
-all-local: $(BIN_CPP) $(BIN_PHP)
+all-local: $(BIN_CPP) $(BIN_PHP) $(BIN_PHP_WEB)
$(BIN_CPP): \
src/*.hx \
@@ -41,6 +42,11 @@
gen-haxe/thrift/test/ThriftTest.hx
$(HAXE) --cwd . php.hxml
+$(BIN_PHP_WEB): \
+ src/*.hx \
+ ../../lib/haxe/src/org/apache/thrift/**/*.hx \
+ gen-haxe/thrift/test/ThriftTest.hx
+ $(HAXE) --cwd . php-web-server.hxml
@@ -56,20 +62,30 @@
clean-local:
$(RM) -r gen-haxe bin
-check: check_cpp check_php
+.NOTPARALLEL:
+
+check: check_cpp \
+ check_php \
+ check_php_web
check_cpp: $(BIN_CPP)
- timeout 10 $(BIN_CPP) server &
+ timeout 20 $(BIN_CPP) server &
sleep 1
$(BIN_CPP) client
sleep 10
check_php: $(BIN_PHP)
- timeout 10 php -f $(BIN_PHP) server &
+ timeout 20 php -f $(BIN_PHP) server &
sleep 1
php -f $(BIN_PHP) client
sleep 10
+check_php_web: $(BIN_PHP_WEB) $(BIN_CPP)
+ timeout 20 php -S 127.0.0.1:9090 router.php &
+ sleep 1
+ $(BIN_CPP) client --transport http
+ sleep 10
+
EXTRA_DIST = \
src \