You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2010/03/10 12:48:20 UTC

svn commit: r921319 - in /qpid/trunk/qpid: cpp/examples/pub-sub/verify_python_cpp.in cpp/examples/verify cpp/examples/verify_all python/examples/pubsub/verify.in

Author: gsim
Date: Wed Mar 10 11:48:20 2010
New Revision: 921319

URL: http://svn.apache.org/viewvc?rev=921319&view=rev
Log:
QPID-2441: patch from Jan Sarenik that prevents verification failures when running the examples if locale is not as expected

Modified:
    qpid/trunk/qpid/cpp/examples/pub-sub/verify_python_cpp.in
    qpid/trunk/qpid/cpp/examples/verify
    qpid/trunk/qpid/cpp/examples/verify_all
    qpid/trunk/qpid/python/examples/pubsub/verify.in

Modified: qpid/trunk/qpid/cpp/examples/pub-sub/verify_python_cpp.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/pub-sub/verify_python_cpp.in?rev=921319&r1=921318&r2=921319&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/pub-sub/verify_python_cpp.in (original)
+++ qpid/trunk/qpid/cpp/examples/pub-sub/verify_python_cpp.in Wed Mar 10 11:48:20 2010
@@ -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

Modified: qpid/trunk/qpid/cpp/examples/verify
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/verify?rev=921319&r1=921318&r2=921319&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/verify (original)
+++ qpid/trunk/qpid/cpp/examples/verify Wed Mar 10 11:48:20 2010
@@ -19,6 +19,7 @@
 # under the License.
 #
 
+export LC_ALL=C
 
 # Driver script to verify installed examples (also used for build tests.)
 #

Modified: qpid/trunk/qpid/cpp/examples/verify_all
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/examples/verify_all?rev=921319&r1=921318&r2=921319&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/examples/verify_all (original)
+++ qpid/trunk/qpid/cpp/examples/verify_all Wed Mar 10 11:48:20 2010
@@ -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

Modified: qpid/trunk/qpid/python/examples/pubsub/verify.in
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/python/examples/pubsub/verify.in?rev=921319&r1=921318&r2=921319&view=diff
==============================================================================
--- qpid/trunk/qpid/python/examples/pubsub/verify.in (original)
+++ qpid/trunk/qpid/python/examples/pubsub/verify.in Wed Mar 10 11:48:20 2010
@@ -1,5 +1,18 @@
 ==== topic_publisher.py.out
 ==== topic_subscriber.py.out | remove_uuid | sort
+Messages on 'europe' queue:
+Messages on 'news' queue:
+Messages on 'usa' queue:
+Messages on 'weather' queue:
+Queues created - please start the topic producer
+Subscribing local queue 'local_europe' to europe-'
+Subscribing local queue 'local_news' to news-'
+Subscribing local queue 'local_usa' to usa-'
+Subscribing local queue 'local_weather' to weather-'
+That's all, folks!
+That's all, folks!
+That's all, folks!
+That's all, folks!
 europe.news 0
 europe.news 0
 europe.news 1
@@ -20,19 +33,6 @@ europe.weather 3
 europe.weather 3
 europe.weather 4
 europe.weather 4
-Messages on 'europe' queue:
-Messages on 'news' queue:
-Messages on 'usa' queue:
-Messages on 'weather' queue:
-Queues created - please start the topic producer
-Subscribing local queue 'local_europe' to europe-'
-Subscribing local queue 'local_news' to news-'
-Subscribing local queue 'local_usa' to usa-'
-Subscribing local queue 'local_weather' to weather-'
-That's all, folks!
-That's all, folks!
-That's all, folks!
-That's all, folks!
 usa.news 0
 usa.news 0
 usa.news 1



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org