diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-05-30 22:33:29 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2024-08-07 10:08:20 -0500 |
| commit | 018736f327af152836fa2e01f12ed067cb59ac00 (patch) | |
| tree | 21a141424cc8de2beb3a611a48efe3e3d8f919e9 /user/gitlab-runner/tests.patch | |
| parent | 79e3f684ad2db0c6df8659e819add7d8517d9cab (diff) | |
| download | packages-018736f327af152836fa2e01f12ed067cb59ac00.tar.gz packages-018736f327af152836fa2e01f12ed067cb59ac00.tar.bz2 packages-018736f327af152836fa2e01f12ed067cb59ac00.tar.xz packages-018736f327af152836fa2e01f12ed067cb59ac00.zip | |
user/gitlab-runner: Update to 15.0.0
* Parallel build on as many cores as normal builds use.
* The module cache is contained within the builddir instead of polluting HOME.
Diffstat (limited to 'user/gitlab-runner/tests.patch')
| -rw-r--r-- | user/gitlab-runner/tests.patch | 47 |
1 files changed, 6 insertions, 41 deletions
diff --git a/user/gitlab-runner/tests.patch b/user/gitlab-runner/tests.patch index 1aff6c653..0762b6b13 100644 --- a/user/gitlab-runner/tests.patch +++ b/user/gitlab-runner/tests.patch @@ -1,58 +1,23 @@ --- gitlab-runner-v12.1.0/shells/bash_test.go 2019-07-19 12:13:32.000000000 +0000 +++ gitlab-runner-v12.1.0/shells/bash_test.go 2020-04-27 00:07:06.763360621 +0000 -@@ -10,12 +10,12 @@ func TestBash_CommandShellEscapes(t *tes - writer := &BashWriter{} +@@ -16,12 +16,12 @@ func TestBash_CommandShellEscapes(t *tes + writer := &BashWriter{useNewEscape: false} writer.Command("foo", "x&(y)") - assert.Equal(t, `$'foo' "x&(y)"`+"\n", writer.String()) + assert.Equal(t, `'foo' "x&(y)"`+"\n", writer.String()) } - func TestBash_IfCmdShellEscapes(t *testing.T) { - writer := &BashWriter{} + func TestBash_IfCmdShellEscapesLegacy(t *testing.T) { + writer := &BashWriter{useNewEscape: false} writer.IfCmd("foo", "x&(y)") -- assert.Equal(t, `if $'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String()) +- assert.Equal(t, `if $'foo' "x&(y)" >/dev/null 2>&1; then`+"\n", writer.String()) + assert.Equal(t, `if 'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String()) } ---- gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2019-07-19 12:13:32.000000000 +0000 -+++ gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2020-04-27 00:01:12.813355024 +0000 -@@ -166,7 +166,7 @@ func TestBuildAbort(t *testing.T) { - defer abortTimer.Stop() - - err = runBuild(t, build) -- assert.EqualError(t, err, "aborted: interrupt") -+ assert.EqualError(t, err, "aborted: Interrupt") - }) - } - ---- gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2019-07-19 12:13:32.000000000 +0000 -+++ gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2020-04-27 00:00:42.493354545 +0000 -@@ -234,7 +234,7 @@ func TestBuildAbort(t *testing.T) { - defer abortTimer.Stop() - - err = runBuild(t, build) -- assert.EqualError(t, err, "aborted: interrupt") -+ assert.EqualError(t, err, "aborted: Interrupt") - }) - } - ---- gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2019-07-19 12:13:32.000000000 +0000 -+++ gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2020-04-27 00:02:36.213356343 +0000 -@@ -24,8 +24,8 @@ func TestShellEscape(t *testing.T) { - in string - out string - }{ -- {"standard string", "$'standard string'"}, -- {"+\t\n\r&", "$'+\\t\\n\\r&'"}, -+ {"standard string", "'standard string'"}, -+ {"+\t\n\r&", "'+\t\n\r&'"}, - {"", "''"}, - } - --- gitlab-runner-v12.1.0/common/build_test.go 2019-07-19 12:13:32.000000000 +0000 +++ gitlab-runner-v12.1.0/common/build_test.go 2020-04-27 00:23:35.173376249 +0000 -@@ -1133,7 +1133,7 @@ func TestWaitForTerminal(t *testing.T) { +@@ -1255,7 +1255,7 @@ func TestWaitForTerminal(t *testing.T) { }, jobTimeout: 3600, waitForTerminalTimeout: time.Hour, |