# HG changeset patch # User sr # Date 1527602917 -7200 # Node ID bcecd53f72d305556da0176264a5775c9fc8ce3a # Parent 2c7183682018ddef56ac2c1c6cd41fab2b6d2d16 class: RegressionTests::HTTPServerTests changed: #setUp diff -r 2c7183682018 -r bcecd53f72d3 quickSelfTest/Make.proto --- a/quickSelfTest/Make.proto Tue May 29 16:08:35 2018 +0200 +++ b/quickSelfTest/Make.proto Tue May 29 16:08:37 2018 +0200 @@ -23,7 +23,7 @@ NOAUTOLOAD=1 NOSUBAUTOLOAD=1 -LOCALINCLUDES= -I$(INCLUDE_TOP)/exept/libcrypt -I$(INCLUDE_TOP)/stx/goodies/regex -I$(INCLUDE_TOP)/stx/goodies/regression -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/goodies/webServer/htmlTree -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp +LOCALINCLUDES= -I$(INCLUDE_TOP)/exept/libcrypt -I$(INCLUDE_TOP)/stx/goodies/communication -I$(INCLUDE_TOP)/stx/goodies/regex -I$(INCLUDE_TOP)/stx/goodies/regression -I$(INCLUDE_TOP)/stx/goodies/sunit -I$(INCLUDE_TOP)/stx/goodies/webServer -I$(INCLUDE_TOP)/stx/goodies/webServer/htmlTree -I$(INCLUDE_TOP)/stx/libbasic -I$(INCLUDE_TOP)/stx/libcomp LOCALDEFINES= GLOBALDEFINES= MAIN_DEFINES=-DIGNORE_IMAGE -DNO_DISPLAY @@ -79,11 +79,13 @@ libstx_libcompat \ libstx_libtool \ libstx_goodies_xml_vw \ + libstx_goodies_communication \ + libstx_goodies_webServer_ui \ libstx_libjavascript \ libstx_goodies_xml_stx \ + libstx_goodies_webServer_htmlTree \ libstx_goodies_regression \ libstx_goodies_webServer \ - libstx_goodies_webServer_htmlTree \ REQUIRED_LIBOBJS= ../../../libbasic/libstx_libbasic$(O_EXT) \ @@ -106,11 +108,13 @@ ../../../libcompat/libstx_libcompat$(O_EXT) \ ../../../libtool/libstx_libtool$(O_EXT) \ ../../xml/vw/libstx_goodies_xml_vw$(O_EXT) \ + ../../communication/libstx_goodies_communication$(O_EXT) \ + ../../webServer/ui/libstx_goodies_webServer_ui$(O_EXT) \ ../../../libjavascript/libstx_libjavascript$(O_EXT) \ ../../xml/stx/libstx_goodies_xml_stx$(O_EXT) \ + ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree$(O_EXT) \ ../../regression/libstx_goodies_regression$(O_EXT) \ ../../webServer/libstx_goodies_webServer$(O_EXT) \ - ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree$(O_EXT) \ REQUIRED_LINK_LIBOBJS= libstx_libbasic$(O_EXT) \ @@ -133,11 +137,13 @@ libstx_libcompat$(O_EXT) \ libstx_libtool$(O_EXT) \ libstx_goodies_xml_vw$(O_EXT) \ + libstx_goodies_communication$(O_EXT) \ + libstx_goodies_webServer_ui$(O_EXT) \ libstx_libjavascript$(O_EXT) \ libstx_goodies_xml_stx$(O_EXT) \ + libstx_goodies_webServer_htmlTree$(O_EXT) \ libstx_goodies_regression$(O_EXT) \ libstx_goodies_webServer$(O_EXT) \ - libstx_goodies_webServer_htmlTree$(O_EXT) \ REQUIRED_SUPPORT_DIRS=RESOURCEFILES @@ -512,6 +518,32 @@ ../../xml/vw/makefile: ../../xml/vw/Make.proto $(TOP)/rules/stmkmf --cd ../../xml/vw +libstx_goodies_communication.so: ../../communication/libstx_goodies_communication.so + ln -sf ../../communication/libstx_goodies_communication.so . + +../../communication/libstx_goodies_communication.so: ../../communication/makefile $(FORCE) + @if [ -f "../../communication/.NOSOURCE" ]; then \ + echo "skip make in ../../communication (no source)"; \ + else \ + cd ../../communication && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \ + fi + +../../communication/makefile: ../../communication/Make.proto + $(TOP)/rules/stmkmf --cd ../../communication + +libstx_goodies_webServer_ui.so: ../../webServer/ui/libstx_goodies_webServer_ui.so + ln -sf ../../webServer/ui/libstx_goodies_webServer_ui.so . + +../../webServer/ui/libstx_goodies_webServer_ui.so: ../../webServer/ui/makefile $(FORCE) + @if [ -f "../../webServer/ui/.NOSOURCE" ]; then \ + echo "skip make in ../../webServer/ui (no source)"; \ + else \ + cd ../../webServer/ui && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \ + fi + +../../webServer/ui/makefile: ../../webServer/ui/Make.proto + $(TOP)/rules/stmkmf --cd ../../webServer/ui + libstx_libjavascript.so: ../../../libjavascript/libstx_libjavascript.so ln -sf ../../../libjavascript/libstx_libjavascript.so . @@ -538,6 +570,19 @@ ../../xml/stx/makefile: ../../xml/stx/Make.proto $(TOP)/rules/stmkmf --cd ../../xml/stx +libstx_goodies_webServer_htmlTree.so: ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so + ln -sf ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so . + +../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so: ../../webServer/htmlTree/makefile $(FORCE) + @if [ -f "../../webServer/htmlTree/.NOSOURCE" ]; then \ + echo "skip make in ../../webServer/htmlTree (no source)"; \ + else \ + cd ../../webServer/htmlTree && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \ + fi + +../../webServer/htmlTree/makefile: ../../webServer/htmlTree/Make.proto + $(TOP)/rules/stmkmf --cd ../../webServer/htmlTree + libstx_goodies_regression.so: ../../regression/libstx_goodies_regression.so ln -sf ../../regression/libstx_goodies_regression.so . @@ -564,19 +609,6 @@ ../../webServer/makefile: ../../webServer/Make.proto $(TOP)/rules/stmkmf --cd ../../webServer -libstx_goodies_webServer_htmlTree.so: ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so - ln -sf ../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so . - -../../webServer/htmlTree/libstx_goodies_webServer_htmlTree.so: ../../webServer/htmlTree/makefile $(FORCE) - @if [ -f "../../webServer/htmlTree/.NOSOURCE" ]; then \ - echo "skip make in ../../webServer/htmlTree (no source)"; \ - else \ - cd ../../webServer/htmlTree && $(MAKE) "CFLAGS_LOCAL=$(GLOBALDEFINES) "; \ - fi - -../../webServer/htmlTree/makefile: ../../webServer/htmlTree/Make.proto - $(TOP)/rules/stmkmf --cd ../../webServer/htmlTree -