Add newline to each generated bash script in rbe_test.go.
"exec format error" showed up on Mac when running the rbe_test.go.
The generated bash scripts did not have a newline at the end of
the file.
Bug: b/162600461
Fixes: b/162600461
Test: "m blueprint_tools" on Android Mac builder.
Change-Id: I425fa5f428733b6569c3fcdaa312023f9761d020
diff --git a/ui/build/rbe_test.go b/ui/build/rbe_test.go
index 908fdf0..23a53b4 100644
--- a/ui/build/rbe_test.go
+++ b/ui/build/rbe_test.go
@@ -36,13 +36,13 @@
env: []string{
"NOSTART_RBE=true",
},
- }, /*{
+ }, {
description: "rbe metrics generated",
env: []string{
"USE_RBE=true",
},
generated: true,
- }*/}
+ }}
for _, tt := range tests {
t.Run(tt.description, func(t *testing.T) {
@@ -91,17 +91,17 @@
description: "output_dir not defined",
bootstrapProgram: rbeBootstrapProgram,
expectedErr: "RBE output dir variable not defined",
- }, /*{
+ }, {
description: "stopRBE failed",
rbeOutputDirDefined: true,
- bootstrapProgram: "#!/bin/bash\nexit 1",
+ bootstrapProgram: "#!/bin/bash\nexit 1\n",
expectedErr: "shutdown failed",
}, {
description: "failed to copy metrics file",
rbeOutputDirDefined: true,
- bootstrapProgram: "#!/bin/bash",
+ bootstrapProgram: "#!/bin/bash\n",
expectedErr: "failed to copy",
- }*/}
+ }}
for _, tt := range tests {
t.Run(tt.description, func(t *testing.T) {
@@ -139,4 +139,4 @@
}
}
-var rbeBootstrapProgram = fmt.Sprintf("#!/bin/bash\necho 1 > $RBE_output_dir/%s", rbeMetricsPBFilename)
+var rbeBootstrapProgram = fmt.Sprintf("#!/bin/bash\necho 1 > $RBE_output_dir/%s\n", rbeMetricsPBFilename)