Author: kpvdr
Date: 2012-05-07 08:59:09 -0400 (Mon, 07 May 2012)
New Revision: 4507
Modified:
store/trunk/cpp/tests/SimpleTest.cpp
store/trunk/cpp/tests/python_tests/resize.py
Log:
Fix for resize python tests when used on out-of-tree builds. Also fix for recent qpid
header reorganization which created a compile error in SimpleTest.cpp.
Modified: store/trunk/cpp/tests/SimpleTest.cpp
===================================================================
--- store/trunk/cpp/tests/SimpleTest.cpp 2012-05-04 13:04:22 UTC (rev 4506)
+++ store/trunk/cpp/tests/SimpleTest.cpp 2012-05-07 12:59:09 UTC (rev 4507)
@@ -31,6 +31,7 @@
#include <qpid/broker/RecoveryManagerImpl.h>
#include <qpid/framing/AMQHeaderBody.h>
#include <qpid/framing/FieldTable.h>
+#include <qpid/framing/FieldValue.h>
#include "qpid/log/Logger.h"
#include "qpid/sys/Timer.h"
Modified: store/trunk/cpp/tests/python_tests/resize.py
===================================================================
--- store/trunk/cpp/tests/python_tests/resize.py 2012-05-04 13:04:22 UTC (rev 4506)
+++ store/trunk/cpp/tests/python_tests/resize.py 2012-05-07 12:59:09 UTC (rev 4507)
@@ -32,7 +32,8 @@
class ResizeTest(StoreTest):
- resize_tool = os.getenv("RESIZE_TOOL", "../../../tools/resize")
+ src_dir = os.getenv("abs_srcdir")
+ resize_tool = os.getenv("RESIZE_TOOL", src_dir +
"/../tools/resize")
def _resize_store(self, store_dir, queue_name, resize_num_files, resize_file_size,
exp_fail):
for f in glob.glob(os.path.join(store_dir, "*")):