Add missing constant for wrappers

The RMRFL_MTCALL constant (rmr_init flag) was not being set in
the list of constants made avalable for wrapper scripts.

Signed-off-by: E. Scott Daniels <daniels@research.att.com>
Change-Id: I6d5329677bd0492711f368e0c9d2f38ccc418e44

diff --git a/CHANGES b/CHANGES
index d0a8694..c81d88a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 API and build change  and fixe summaries. Doc correctsions
 and/or changes are not mentioned here; see the commit messages.
 
+2019 September 19; version 1.8.1
+       Correct missing constant for wrappers.
+       
 2019 September 19; version 1.8.0
        New message types added:
                RAN_CONNECTED, RAN_RESTARTED, RAN_RECONFIGURED

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 983aa0b..b84fb8b 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ cmake_minimum_required( VERSION 3.5 )
 
 set( major_version "1" )               # should be automatically populated from git tag later, but until CI process sets a tag we use this
 set( minor_version "8" )
-set( patch_level "0" )
+set( patch_level "1" )
 
 set( install_root "${CMAKE_INSTALL_PREFIX}" )
 set( install_inc "include/rmr" )

diff --git a/src/rmr/common/src/wrapper.c b/src/rmr/common/src/wrapper.c
index 68af084..18d2a23 100644 (file)
--- a/src/rmr/common/src/wrapper.c
+++ b/src/rmr/common/src/wrapper.c
@@ -108,6 +108,8 @@ extern char* rmr_get_consts( ) {
        remain -= bang_on( wbuf, phrase, remain );
        phrase = build_ival( "RMRFL_AUTO_ALLOC",  RMRFL_AUTO_ALLOC, ADD_SEP );
        remain -= bang_on( wbuf, phrase, remain );
+       phrase = build_ival( "RMRFL_MTCALL",      RMRFL_MTCALL, ADD_SEP );
+       remain -= bang_on( wbuf, phrase, remain );
 
        phrase = build_ival( "RMR_DEF_SIZE",      RMR_DEF_SIZE, ADD_SEP );
        remain -= bang_on( wbuf, phrase, remain );

diff --git a/test/app_test/run_all.ksh b/test/app_test/run_all.ksh
index 34a4b84..990694d 100644 (file)
--- a/test/app_test/run_all.ksh
+++ b/test/app_test/run_all.ksh
@@ -16,7 +16,11 @@ do
 done
 
 set -e
+echo "---- app -------------"
 ksh run_app_test.ksh -v $installed $build
+echo "----- multi -----------"
 ksh run_multi_test.ksh
+echo "----- round robin ----"
 ksh run_rr_test.ksh
+echo "----- rts ------------"
 ksh run_rts_test.ksh -s 20

diff --git a/test/app_test/run_multi_test.ksh b/test/app_test/run_multi_test.ksh
index 4e1a7a3..fa476ec 100644 (file)
--- a/test/app_test/run_multi_test.ksh
+++ b/test/app_test/run_multi_test.ksh
@@ -39,10 +39,13 @@
 
 
 # The sender and receivers are run asynch. Their exit statuses are captured in a
-# file in order for the 'main' to pick them up easily.
+# file in order for the 'main' to pick them up easily. For the multi test the 
+# async connect must be DISABLED because in some environments (um, jenkins) the
+# session connect time lags enough that the first message can be dropped silently.
+# It doesn't happen all of the time, but frequently enough to be annoying. 
 #
 function run_sender {
-       ./sender $nmsg $delay
+       RMR_ASYNC_CONN=0 ./sender $nmsg $delay
        echo $? >/tmp/PID$$.src         # must communicate state back via file b/c asynch
 }