Merge lp:~ceejatec/zorba/old-remote-queue into lp:zorba

Proposed by Chris Hillery
Status: Merged
Approved by: Chris Hillery
Approved revision: 10465
Merged at revision: 10466
Proposed branch: lp:~ceejatec/zorba/old-remote-queue
Merge into: lp:zorba
Diff against target: 22 lines (+4/-6)
1 file modified
test/remote/RunRemoteTest.cmake (+4/-6)
To merge this branch: bzr merge lp:~ceejatec/zorba/old-remote-queue
Reviewer Review Type Date Requested Status
Sorin Marian Nasoi Approve
Review via email: mp+76681@code.launchpad.net

Commit message

 Make RunRemoteTest.cmake work (for a little while, at least) with Zorba core
 from bazaar. No core changes will be submitted; this is a stop-gap for
 supporting non-core module development.

To post a comment you must log in.
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Sorin Marian Nasoi (sorin.marian.nasoi) wrote :

I looked over the changes.

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

Validation queue job old-remote-queue-2011-09-23T07-14-18.895Z 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 'test/remote/RunRemoteTest.cmake'
2--- test/remote/RunRemoteTest.cmake 2011-08-10 09:40:29 +0000
3+++ test/remote/RunRemoteTest.cmake 2011-09-23 07:13:35 +0000
4@@ -60,14 +60,12 @@
5 OUTPUT_VARIABLE datetime)
6 string (REPLACE ":" "-" datetime "${datetime}")
7
8-# Package up local changes for Zorba
9+# Configure working directory for building submission
10 set (workdir "${CMAKE_ZORBA_BUILD_DIR}/remotequeue/changes-${datetime}")
11-svn_package ("${srcdir}" "${workdir}" "${changelist}" "${workdir}/zorba.tgz")
12
13-# Save the local "svn info" so the remote queue easily knows what branch
14-# we're working in
15-execute_process (COMMAND "${svn}" info --xml
16- WORKING_DIRECTORY "${srcdir}" OUTPUT_FILE "${workdir}/zorba-info.xml")
17+# Create a fake zorba-info.xml that points to the old SF zorba trunk
18+file (WRITE "${workdir}/zorba-info.xml"
19+ "<info><entry><url>http://zorba.svn.sourceforge.net/svnroot/zorba/trunk/zorba</url></entry></info>")
20
21 # Extract ZORBA_MODULE_DIR. This seems like a kludgy approach, but
22 # unfortunately load_cache() can't be called in CMake scripts.

Subscribers

People subscribed via source and target branches