Merge branch 'gz-utils3' into mjcarroll/build_examples

gazebosim · Oct 17, 2024 · 2de90b9 · 2de90b9
2 parents ea92484 + 10b3946
commit 2de90b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml
@@ -19,6 +19,7 @@ jobs:
         ]
       exclude: |
         [
-          {"bazelversion": "6.4.0"}
-          {"bazelversion": "5.4.0"},
+          {"folder": ".", "bzlmodEnabled": false},
+          {"bazelversion": "6.4.0"},
+          {"bazelversion": "5.4.0"}
         ]
diff --git a/test/integration/subprocess_TEST.cc b/test/integration/subprocess_TEST.cc
@@ -52,8 +52,8 @@ TEST(Subprocess, CreateInvalidSpaces)
   auto cout = proc.Stdout();
   auto cerr = proc.Stdout();
 
-  EXPECT_TRUE(cout.empty());
-  EXPECT_TRUE(cerr.empty());
+  EXPECT_TRUE(cout.empty()) << cout;
+  EXPECT_TRUE(cerr.empty()) << cerr;
 }
 
 /////////////////////////////////////////////////
@@ -71,7 +71,7 @@ TEST(Subprocess, CreateValid)
   auto cerr = proc.Stdout();
 
   EXPECT_FALSE(cout.empty());
-  EXPECT_TRUE(cerr.empty());
+  EXPECT_TRUE(cerr.empty()) << cerr;
 }
 
 /////////////////////////////////////////////////
@@ -91,7 +91,8 @@ TEST(Subprocess, Cout)
   auto cout = proc.Stdout();
   auto cerr = proc.Stderr();
   EXPECT_FALSE(cout.empty());
-  EXPECT_TRUE(cerr.empty());
+  EXPECT_NE(std::string::npos, cout.find("Iteration: ")) << cout;
+  EXPECT_TRUE(cerr.empty()) << cerr;
 }
 
 /////////////////////////////////////////////////
@@ -110,8 +111,9 @@ TEST(Subprocess, Cerr)
   EXPECT_FALSE(proc.Alive());
   auto cout = proc.Stdout();
   auto cerr = proc.Stderr();
-  EXPECT_TRUE(cout.empty());
+  EXPECT_TRUE(cout.empty()) << cout;
   EXPECT_FALSE(cerr.empty());
+  EXPECT_NE(std::string::npos, cerr.find("Iteration: ")) << cerr;
 }
 
 /////////////////////////////////////////////////