From 79dcf732cc673b788df9974062b97aa9731b9168 Mon Sep 17 00:00:00 2001 From: Patrice Arruda Date: Sat, 1 Aug 2020 16:49:35 +0000 Subject: [PATCH] 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 --- ui/build/rbe_test.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ui/build/rbe_test.go b/ui/build/rbe_test.go index 908fdf012..23a53b449 100644 --- a/ui/build/rbe_test.go +++ b/ui/build/rbe_test.go @@ -36,13 +36,13 @@ func TestDumpRBEMetrics(t *testing.T) { 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 @@ func TestDumpRBEMetricsErrors(t *testing.T) { 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 @@ func TestDumpRBEMetricsErrors(t *testing.T) { } } -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)