From 3032b91ff7b6c5cc4f506a162f2f3a1ae7c2df01 Mon Sep 17 00:00:00 2001
From: Jocelyn Fiat <github@djoce.net>
Date: Wed, 23 Nov 2011 18:36:56 +0100
Subject: [PATCH] Fixed sample example config file after recent location change
 for "rest" lib

---
 draft/library/server/request/rest/tests/sample.ecf | 12 ++++++------
 tests/run_CI_tests.py                              |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/draft/library/server/request/rest/tests/sample.ecf b/draft/library/server/request/rest/tests/sample.ecf
index 006bc5e4..f9640b61 100644
--- a/draft/library/server/request/rest/tests/sample.ecf
+++ b/draft/library/server/request/rest/tests/sample.ecf
@@ -12,13 +12,13 @@
 		<setting name="concurrency" value="thread"/>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
 		<library name="rest" location="..\rest-safe.ecf" readonly="false"/>
-		<library name="wsf" location="..\..\..\wsf\wsf-safe.ecf" readonly="false"/>
-		<library name="http" location="..\..\..\..\protocol\http\http-safe.ecf" readonly="false"/>
+		<library name="wsf" location="..\..\..\..\..\..\library\server\wsf\wsf-safe.ecf" readonly="false"/>
+		<library name="http" location="..\..\..\..\..\..\library\protocol\http\http-safe.ecf" readonly="false"/>
 	</target>
 	<target name="sample_fcgi" extends="common">
 		<root class="APP_SERVER" feature="make"/>
 		<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">
 			<file_rule>
 				<exclude>/gateway$</exclude>
@@ -29,7 +29,7 @@
 	<target name="sample_cgi" extends="common">
 		<root class="APP_SERVER" feature="make"/>
 		<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">
 			<file_rule>
 				<exclude>/gateway$</exclude>
@@ -41,8 +41,8 @@
 	<target name="sample_nino" extends="common">
 		<root class="APP_SERVER" feature="make"/>
 		<setting name="executable_name" value="sample"/>
-		<library name="ewsgi_nino" location="..\..\..\ewsgi\connectors\nino\nino-safe.ecf" readonly="false"/>
-		<library name="default_nino" location="..\..\..\wsf\default\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="..\..\..\..\..\..\library\server\wsf\default\nino-safe.ecf" readonly="false"/>
 
 
 		<cluster name="src" location=".\src\" recursive="true">
diff --git a/tests/run_CI_tests.py b/tests/run_CI_tests.py
index 986d10a6..83f66555 100644
--- a/tests/run_CI_tests.py
+++ b/tests/run_CI_tests.py
@@ -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"))
 	if keep_all:
 		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
-
 	if clobber:
 		cmd = "%s -clean" % (cmd)
+	print "command: %s" % (cmd)
 	res_output = eval_cmd_output(cmd)
+	print "# check compile_all tests"
 
 	print "# Analyze check_compilations results"
 	lines = re.split ("\n", res_output)