mirrors/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed sample example config file after recent location change for "rest" lib

Browse Source
This commit is contained in:
Jocelyn Fiat
2011-11-23 18:36:56 +01:00
parent 772b88f257
commit 3032b91ff7
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
draft/library/server/request/rest/tests/sample.ecf
View File

@@ -12,13 +12,13 @@
<setting name="concurrency" value="thread"/> <setting name="concurrency" value="thread"/>
<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/> <library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
<library name="rest" location="..\rest-safe.ecf" readonly="false"/> <library name="rest" location="..\rest-safe.ecf" readonly="false"/>
<library name="wsf" location="..\..\..\wsf\wsf-safe.ecf" readonly="false"/> <library name="wsf" location="..\..\..\..\..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
<library name="http" location="..\..\..\..\protocol\http\http-safe.ecf" readonly="false"/> <library name="http" location="..\..\..\..\..\..\library\protocol\http\http-safe.ecf" readonly="false"/>
</target> </target>
<target name="sample_fcgi" extends="common"> <target name="sample_fcgi" extends="common">
<root class="APP_SERVER" feature="make"/> <root class="APP_SERVER" feature="make"/>
<setting name="executable_name" value="sample"/> <setting name="executable_name" value="sample"/>
<library name="ewsgi_fcgi" location="..\..\..\ewsgi\connectors\libfcgi\libfcgi-safe.ecf" readonly="false"/> <library name="ewsgi_fcgi" location="..\..\..\..\..\..\library\server\ewsgi\connectors\libfcgi\libfcgi-safe.ecf" readonly="false"/>
<cluster name="src" location=".\src\" recursive="true"> <cluster name="src" location=".\src\" recursive="true">
<file_rule> <file_rule>
<exclude>/gateway$</exclude> <exclude>/gateway$</exclude>
@@ -29,7 +29,7 @@
<target name="sample_cgi" extends="common"> <target name="sample_cgi" extends="common">
<root class="APP_SERVER" feature="make"/> <root class="APP_SERVER" feature="make"/>
<setting name="executable_name" value="sample"/> <setting name="executable_name" value="sample"/>
<library name="ewsgi_cgi" location="..\..\..\ewsgi\connectors\cgi\cgi-safe.ecf" readonly="false"/> <library name="ewsgi_cgi" location="..\..\..\..\..\..\library\server\ewsgi\connectors\cgi\cgi-safe.ecf" readonly="false"/>
<cluster name="src" location=".\src\" recursive="true"> <cluster name="src" location=".\src\" recursive="true">
<file_rule> <file_rule>
<exclude>/gateway$</exclude> <exclude>/gateway$</exclude>
@@ -41,8 +41,8 @@
<target name="sample_nino" extends="common"> <target name="sample_nino" extends="common">
<root class="APP_SERVER" feature="make"/> <root class="APP_SERVER" feature="make"/>
<setting name="executable_name" value="sample"/> <setting name="executable_name" value="sample"/>
<library name="ewsgi_nino" location="..\..\..\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/> <library name="ewsgi_nino" location="..\..\..\..\..\..\library\server\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/>
<library name="default_nino" location="..\..\..\wsf\default\nino-safe.ecf" readonly="false"/> <library name="default_nino" location="..\..\..\..\..\..\library\server\wsf\default\nino-safe.ecf" readonly="false"/>
<cluster name="src" location=".\src\" recursive="true"> <cluster name="src" location=".\src\" recursive="true">

5
tests/run_CI_tests.py
View File

@@ -97,12 +97,13 @@ def runTestForProject(where):
cmd = "compile_all -ecb -melt -eifgen %s -ignore %s " % (os.path.join ("tests", "temp"), os.path.join ("tests", "compile_all.ini")) cmd = "compile_all -ecb -melt -eifgen %s -ignore %s " % (os.path.join ("tests", "temp"), os.path.join ("tests", "compile_all.ini"))
if keep_all: if keep_all:
res_output = eval_cmd_output("compile_all -l NoWhereJustToTestUsage -keep", True) res_output = eval_cmd_output("compile_all -l NoWhereJustToTestUsage -keep", True)
if res_output.find("Unreconized switch '-keep'") == -1: if res_output.find("switch '-keep'") == -1:
cmd = "%s -keep passed" % (cmd) # forget about failed one .. we'll try again next time cmd = "%s -keep passed" % (cmd) # forget about failed one .. we'll try again next time
if clobber: if clobber:
cmd = "%s -clean" % (cmd) cmd = "%s -clean" % (cmd)
print "command: %s" % (cmd)
res_output = eval_cmd_output(cmd) res_output = eval_cmd_output(cmd)
print "# check compile_all tests"
print "# Analyze check_compilations results" print "# Analyze check_compilations results"
lines = re.split ("\n", res_output) lines = re.split ("\n", res_output)