Author: shuston
Date: Tue Oct 6 11:41:42 2009
New Revision: 822225
URL: http://svn.apache.org/viewvc?rev=822225&view=rev
Log:
Remove conflicts checked in earlier
Modified:
qpid/trunk/qpid/cpp/src/tests/run_header_test.ps1
Modified: qpid/trunk/qpid/cpp/src/tests/run_header_test.ps1
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/run_header_test.ps1?rev=822225&r1=822224&r2=822225&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/run_header_test.ps1 (original)
+++ qpid/trunk/qpid/cpp/src/tests/run_header_test.ps1 Tue Oct 6 11:41:42 2009
@@ -21,7 +21,6 @@
# TODO: this should be expanded to cover a wider set of types and go
# in both directions
-<<<<<<< .mine
$srcdir = Split-Path $myInvocation.InvocationName
$PYTHON_DIR = "$srcdir\..\..\..\python"
if (!(Test-Path $PYTHON_DIR -pathType Container)) {
@@ -29,15 +28,10 @@
exit 0
}
-=======
-$srcdir = Split-Path $myInvocation.InvocationName
-$PYTHON_DIR = "$srcdir\..\..\..\python"
->>>>>>> .r822090
if (Test-Path qpidd.port) {
set-item -path env:QPID_PORT -value (get-content -path qpidd.port
-totalcount 1)
}
-<<<<<<< .mine
# Test runs from the tests directory but the test executables are in a
# subdirectory based on the build type. Look around for it before trying
# to start it.
@@ -47,24 +41,13 @@
if (Test-Path $prog) {
break
}
-=======
-if (Test-Path $PYTHON_DIR -pathType Container) {
- Invoke-Expression "$env:OUTDIR\header_test -p $env:QPID_PORT"
- $env:PYTHONPATH="$PYTHON_DIR;$env:PYTHONPATH"
- python "$srcdir/header_test.py" "localhost" "$env:QPID_PORT"
- exit $LASTEXITCODE
->>>>>>> .r822090
}
if (!(Test-Path $prog)) {
"Cannot locate header_test.exe"
exit 1
}
-<<<<<<< .mine
Invoke-Expression "$prog -p $env:QPID_PORT" | Write-Output
$env:PYTHONPATH="$PYTHON_DIR;$env:PYTHONPATH"
Invoke-Expression "python $srcdir/header_test.py localhost $env:QPID_PORT" |
Write-Output
exit $LASTEXITCODE
-
-=======
->>>>>>> .r822090
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
