Zorba

Merge lp:~zorba-coders/zorba/temp-http-client-workarounds into lp:zorba

  1. temp-http-client-workarounds
  2. Merge into trunk
Proposed by Chris Hillery
Status: Merged
Approved by: Juan Zacarias
Approved revision: 10970
Merged at revision: 10970
Proposed branch: lp:~zorba-coders/zorba/temp-http-client-workarounds
Merge into: lp:zorba
Diff against target: 24 lines (+4/-2)
2 files modified
bin/CMakeLists.txt (+3/-1)
modules/ExternalModules.conf (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/temp-http-client-workarounds
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+118237@code.launchpad.net

Commit message

Test temporarily disabled while http-client is being updated. Also get HEAD of OAuth module rather than zorba-2.5 tag for some reason.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/temp-http-client-workarounds-2012-08-05T18-38-07.752Z/log.html

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job temp-http-client-workarounds-2012-08-05T18-38-07.752Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/CMakeLists.txt'
2--- bin/CMakeLists.txt 2012-07-24 08:48:48 +0000
3+++ bin/CMakeLists.txt 2012-08-04 06:13:23 +0000
4@@ -122,4 +122,6 @@
5 PASS_REGULAR_EXPRESSION "hello, v2")
6
7 # test compilation of the perf script
8-ZORBA_ADD_TEST(bin/zorba_compilechk4 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/../test/zperf/src/start.xq" -f --compile-only)
9+# TEMPORARILY COMMENTED OUT - uses non-core http-client module which is
10+# temporarily disabled
11+#ZORBA_ADD_TEST(bin/zorba_compilechk4 zorbacmd -q "${CMAKE_CURRENT_SOURCE_DIR}/../test/zperf/src/start.xq" -f --compile-only)
12
13=== modified file 'modules/ExternalModules.conf'
14--- modules/ExternalModules.conf 2012-07-24 08:48:48 +0000
15+++ modules/ExternalModules.conf 2012-08-04 06:13:23 +0000
16@@ -34,7 +34,7 @@
17 http-client bzr lp:zorba/http-client-module zorba-2.5
18 image bzr lp:zorba/image-module zorba-2.5
19 languages bzr lp:zorba/languages-module zorba-2.5
20-oauth bzr lp:zorba/oauth-module zorba-2.5
21+oauth bzr lp:zorba/oauth-module
22 process bzr lp:zorba/process-module zorba-2.5
23 security bzr lp:zorba/security-module zorba-2.5
24 system bzr lp:zorba/system-module zorba-2.5

Subscribers

People subscribed via source and target branches