src/tests/python_tests: fix exit status if QPID_NO_PREVIEW is set.

src/qpid/framing/AMQFrame.h: frame header setters/getters with 0-10 naming.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@649339 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 15 insertions, 1 deletions

diff --git a/qpid/cpp/src/qpid/framing/AMQFrame.h b/qpid/cpp/src/qpid/framing/AMQFrame.h
index 649a65bce4..2318492e2d 100644
--- a/qpid/cpp/src/qpid/framing/AMQFrame.h
+++ b/qpid/cpp/src/qpid/framing/AMQFrame.h
@@ -80,6 +80,20 @@ class AMQFrame : public AMQDataBlock
     bool decode(Buffer& buffer); 
     uint32_t size() const;
 
+    // 0-10 terminology: first/last frame (in segment) first/last segment (in assembly)
+
+    bool isFirstSegment() const { return bof; }
+    bool isLastSegment() const { return eof; }
+    bool isFirstFrame() const { return bos; }
+    bool isLastFrame() const { return eos; }
+
+    void setFirstSegment(bool set=true) { bof = set; }
+    void setLastSegment(bool set=true) { eof = set; }
+    void setFirstFrame(bool set=true) { bos = set; }
+    void setLastFrame(bool set=true) { eos = set; }
+
+    // 0-9 terminology: beginning/end of frameset, beginning/end of segment.
+
     bool getBof() const { return bof; }
     void setBof(bool isBof) { bof = isBof; }
     bool getEof() const { return eof; }
diff --git a/qpid/cpp/src/tests/python_tests b/qpid/cpp/src/tests/python_tests
index b7e389dbb2..0e7b494896 100755
--- a/qpid/cpp/src/tests/python_tests
+++ b/qpid/cpp/src/tests/python_tests
@@ -12,7 +12,7 @@ run() {
 if test -d ../../../python ;  then
     cd ../../../python
     run 0-10-errata cpp_failing_0-10.txt
-    test -z "$QPID_NO_PREVIEW" && run ../specs/amqp.0-10-preview.xml cpp_failing_0-10_preview.txt
+    if test -z "$QPID_NO_PREVIEW" ; then run ../specs/amqp.0-10-preview.xml cpp_failing_0-10_preview.txt; fi
 else
     echo Warning: python tests not found.
 fi