Extend cmsTraceFunction test to putenv() and --abort

Author: makortel

Utilities/ReleaseScripts/test/gdb/test-cmsTraceFunction-putenv.cpp

@@ -0,0 +1,35 @@
+#include <iostream>
+#include <cstdlib>
+#include <cstring>
+#include <stdlib.h>
+
+class ScheduleItems {
+public:
+  ScheduleItems() {}
+  void initMisc();
+};
+
+void ScheduleItems::initMisc() { std::cout << "ScheduleItems::initMisc() called" << std::endl; }
+
+void my_putenv(const char* env, char* put) {
+  putenv(put);
+  std::cout << "putenv() called" << std::endl;
+  std::cout << env << "=" << std::getenv(env) << std::endl;
+}
+
+int main() {
+  // putenv() expects modifiable char array that lives throughout the program
+  char* foo1 = new char[10];
+  char* foo2 = new char[10];
+  char* foo3 = new char[10];
+  std::strncpy(foo1, "FOO=1", 10);
+  std::strncpy(foo2, "FOO=2", 10);
+  std::strncpy(foo3, "FOO=3", 10);
+
+  my_putenv("FOO", foo1);
+  ScheduleItems obj;
+  obj.initMisc();
+  my_putenv("FOO", foo2);
+  my_putenv("FOO", foo3);
+  return 0;
+}

Utilities/ReleaseScripts/test/gdb/test-cmsTraceFunction-setenv.sh

@@ -1,9 +1,45 @@
 #!/bin/bash -ex
+
+TRACE="cmsTraceFunction --startAfterFunction ScheduleItems::initMisc setenv -f putenv --abort"
+
+# Check setenv
 g++ -o test-cmsTraceFunction-setenv $(dirname $0)/test-cmsTraceFunction-setenv.cpp
-cmsTraceFunction --startAfterFunction ScheduleItems::initMisc setenv ./test-cmsTraceFunction-setenv 2>&1 | grep setenv > setenv.log
-rm -f test-cmsTraceFunction-setenv
-setenv_count=$(grep '^setenv() called' setenv.log | wc -l)
-break_setenv=$(grep 'Breakpoint .* in setenv ()' setenv.log | wc -l)
-if [ ${setenv_count} != 3 ] || [ ${break_setenv} != 2 ] ; then
+set +e
+$TRACE ./test-cmsTraceFunction-setenv 2>&1 > setenv_raw.log
+ret_setenv=$?
+set -e
+grep setenv setenv_raw.log > setenv.log
+#rm -f test-cmsTraceFunction-setenv
+
+if [ ${ret_setenv} = 0 ]; then
+  echo "cmsTraceFunction exited with exit code 0, expected non-zero exit code"
+  exit 1
+fi
+
+setenv_count=$(grep -c '^setenv() called' setenv.log)
+break_setenv=$(grep -c 'Breakpoint .* in setenv ()' setenv.log)
+if [ ${setenv_count} != 1 ] || [ ${break_setenv} != 1 ] ; then
+  echo "Unexpected number of setenv calls ${setenv_count} or breakpoints ${break_setenv}; expecting both to be 1"
+  exit 1
+fi
+
+# Check putenv
+g++ -o test-cmsTraceFunction-putenv $(dirname $0)/test-cmsTraceFunction-putenv.cpp
+set +e
+$TRACE ./test-cmsTraceFunction-putenv 2>&1 > putenv_raw.log
+ret_putenv=$?
+set -e
+grep putenv putenv_raw.log > putenv.log
+rm -f test-cmsTraceFunction-putenv
+
+if [ ${ret_puttenv} = 0 ]; then
+  echo "cmsTraceFunction exited with exit code 0, expected non-zero exit code"
+  exit 1
+fi
+
+putenv_count=$(grep -c '^putenv() called' putenv.log)
+break_putenv=$(grep -c 'Breakpoint .* in putenv ()' putenv.log)
+if [ ${putenv_count} != 1 ] || [ ${break_tenv} != 1 ] ; then
+  echo "Unexpected number of putenv calls ${putenv_count} or breakpoints ${break_putenv}; expecting both to be 1"
   exit 1
 fi