Skip to content

Commit

Permalink
Convert win lineendings to Unix for tests which need it on Windows
Browse files Browse the repository at this point in the history
Ticket: ENT-10433

Changelog: none
(cherry picked from commit 9a9d10d)
  • Loading branch information
Aleksei Shpakovskii committed Sep 15, 2023
1 parent b270937 commit eb5c801
Show file tree
Hide file tree
Showing 11 changed files with 42 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ bundle agent __main__
"bundlesequence" usebundle => default("$(this.promise_filename)");
}

bundle agent init
{
commands:
windows::
"$(G.dos2unix) $(this.promise_dirname)/expected_output.txt" -> { "ENT-10433" };
}

bundle agent test
{
meta:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ bundle agent __main__
"bundlesequence" usebundle => default("$(this.promise_filename)");
}

bundle agent init
{
commands:
windows::
"$(G.dos2unix) $(this.promise_dirname)/expected_output.txt" -> { "ENT-10433" };
}

bundle agent test
{
meta:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ body common control

bundle agent init
{
commands:
windows::
"$(G.dos2unix) $(this.promise_filename).expected" -> { "ENT-10433" };

files:
"$(G.testdir)/actual.txt"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@ bundle agent init
vars:
"autorun" slist => bundlesmatching(".*", "autorun");

commands:
windows::
"$(G.dos2unix) $(this.promise_filename).expected" -> { "ENT-10433" };

files:
"$(G.testfile)"
edit_line => empty;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ bundle agent init
vars:
"autorun" slist => bundlesmatching(".*", "autorun");

commands:
windows::
"$(G.dos2unix) $(this.promise_filename).expected" -> { "ENT-10433" };

files:
"$(G.testfile)"
edit_line => empty;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ bundle agent init
meta:
"tags" slist => { "find" };

commands:
windows::
"$(G.dos2unix) $(this.promise_filename).expected" -> { "ENT-10433" };

vars:
# We want to be sure we can reference this data subsequently
"d" data => parsejson( '{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ bundle agent init
{
meta:
"tags" slist => { "find" };
commands:
windows::
"$(G.dos2unix) $(this.promise_filename).expected" -> { "ENT-10433" };

}

bundle agent test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ bundle agent check
classes:
"passed" expression => strcmp("$(test.expected)", "$(test.actual)");
reports:
windows::
"$(this.promise_filename) SFAIL/ENT-10433";
DEBUG::
"Expected: '$(test.expected)'";
"Found: '$(test.actual)'";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ bundle agent check
classes:
"passed" expression => strcmp("$(test.expected)", "$(test.actual)");
reports:
windows::
"$(this.promise_filename) SFAIL/ENT-10433";
DEBUG::
"Expected: '$(test.expected)'";
"Found: '$(test.actual)'";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ body common control

bundle agent init
{
commands:
windows::
"$(G.dos2unix) $(this.promise_filename).expected.txt" -> { "ENT-10433" };

files:
"$(G.testdir)/reports.txt"
delete => tidy;
Expand Down
1 change: 1 addition & 0 deletions tests/acceptance/dcs.cf.sub
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ bundle common G
# General commands.
"cmds" slist => { "date",
"dd",
"dos2unix",
"diff",
"cat",
"colordiff",
Expand Down

0 comments on commit eb5c801

Please sign in to comment.