summaryrefslogtreecommitdiff
path: root/qpid/cpp
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2010-03-10 11:48:20 +0000
committerGordon Sim <gsim@apache.org>2010-03-10 11:48:20 +0000
commit1ed642bc5fc90709604e2f5f12b3358e7070dbb5 (patch)
tree710da4bf190413d7c81b0b588cf0485201f21f97 /qpid/cpp
parent1039dcfcca3c7060be937c23c1c2199f62fc334e (diff)
downloadqpid-python-1ed642bc5fc90709604e2f5f12b3358e7070dbb5.tar.gz
QPID-2441: patch from Jan Sarenik that prevents verification failures when running the examples if locale is not as expected
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@921319 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
-rw-r--r--qpid/cpp/examples/pub-sub/verify_python_cpp.in8
-rwxr-xr-xqpid/cpp/examples/verify1
-rwxr-xr-xqpid/cpp/examples/verify_all2
3 files changed, 6 insertions, 5 deletions
diff --git a/qpid/cpp/examples/pub-sub/verify_python_cpp.in b/qpid/cpp/examples/pub-sub/verify_python_cpp.in
index 52e8db9d72..f2871eb743 100644
--- a/qpid/cpp/examples/pub-sub/verify_python_cpp.in
+++ b/qpid/cpp/examples/pub-sub/verify_python_cpp.in
@@ -5,6 +5,10 @@ Declaring queue: news
Declaring queue: usa
Declaring queue: weather
Listening for messages ...
+Message: That's all, folks! from europe
+Message: That's all, folks! from news
+Message: That's all, folks! from usa
+Message: That's all, folks! from weather
Message: europe.news 0 from europe
Message: europe.news 0 from news
Message: europe.news 1 from europe
@@ -25,10 +29,6 @@ Message: europe.weather 3 from europe
Message: europe.weather 3 from weather
Message: europe.weather 4 from europe
Message: europe.weather 4 from weather
-Message: That's all, folks! from europe
-Message: That's all, folks! from news
-Message: That's all, folks! from usa
-Message: That's all, folks! from weather
Message: usa.news 0 from news
Message: usa.news 0 from usa
Message: usa.news 1 from news
diff --git a/qpid/cpp/examples/verify b/qpid/cpp/examples/verify
index 43e1206a0c..9a1ed078d6 100755
--- a/qpid/cpp/examples/verify
+++ b/qpid/cpp/examples/verify
@@ -19,6 +19,7 @@
# under the License.
#
+export LC_ALL=C
# Driver script to verify installed examples (also used for build tests.)
#
diff --git a/qpid/cpp/examples/verify_all b/qpid/cpp/examples/verify_all
index baffd422ad..9d71c7498a 100755
--- a/qpid/cpp/examples/verify_all
+++ b/qpid/cpp/examples/verify_all
@@ -48,7 +48,7 @@ if test -z "$exclude_regexp"; then
run_examples=$all_examples
else
for f in $all_examples; do
- { cat $f | grep $exclude_regexp > /dev/null ; } || run_examples="$run_examples $f"
+ { echo $f | grep $exclude_regexp > /dev/null ; } || run_examples="$run_examples $f"
done
fi
$verify $topsrcdir $topbuilddir $run_examples