From b35f0a4173250d684b208c15a4d1922148236b27 Mon Sep 17 00:00:00 2001 From: Victor Moene Date: Wed, 25 Mar 2026 14:02:19 +0100 Subject: [PATCH] Added trailing sep in acceptance tests Ticket: CFE-4623 --- examples/findfiles.cf | 2 +- tests/acceptance/01_vars/02_functions/findfiles.cf | 8 ++++---- .../acceptance/01_vars/02_functions/findfiles_up.cf | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/examples/findfiles.cf b/examples/findfiles.cf index 723aea9d13..1ef73683de 100644 --- a/examples/findfiles.cf +++ b/examples/findfiles.cf @@ -40,6 +40,6 @@ bundle agent run ############################################################################### #+begin_src example_output #@ ``` -#@ R: All files that match '/[tT][mM][pP]' = /tmp +#@ R: All files that match '/[tT][mM][pP]' = /tmp/ #@ ``` #+end_src diff --git a/tests/acceptance/01_vars/02_functions/findfiles.cf b/tests/acceptance/01_vars/02_functions/findfiles.cf index 978e2ea591..2827d45871 100644 --- a/tests/acceptance/01_vars/02_functions/findfiles.cf +++ b/tests/acceptance/01_vars/02_functions/findfiles.cf @@ -74,15 +74,15 @@ bundle agent check { vars: !windows:: - "expected[a]" string => "$(G.testdir)/a,$(G.testdir)/d,$(G.testdir)/g"; - "expected[b]" string => "$(G.testdir)/a,$(G.testdir)/bc,$(G.testdir)/d,$(G.testdir)/g,$(G.testdir)/klm,$(G.testdir)/tu"; + "expected[a]" string => "$(G.testdir)/a,$(G.testdir)/d/,$(G.testdir)/g/"; + "expected[b]" string => "$(G.testdir)/a,$(G.testdir)/bc,$(G.testdir)/d/,$(G.testdir)/g/,$(G.testdir)/klm/,$(G.testdir)/tu/"; - "expected[c]" string => "$(G.testdir)/d/e,$(G.testdir)/g/h"; + "expected[c]" string => "$(G.testdir)/d/e/,$(G.testdir)/g/h/"; "expected[d]" string => "$(G.testdir)/a,$(G.testdir)/bc"; "expected[e]" string => ""; "expected[f]" string => "$(G.testdir)/tu/*"; - "expected[g]" string => "$(G.testdir)/a,$(G.testdir)/bc,$(G.testdir)/d,$(G.testdir)/g,$(G.testdir)/klm,$(G.testdir)/tu,$(G.testdir)/d/e,$(G.testdir)/g/h,$(G.testdir)/klm/nop,$(G.testdir)/tu/*,$(G.testdir)/d/e/f,$(G.testdir)/g/h/i,$(G.testdir)/klm/nop/qrs,$(G.testdir)/g/h/i/j"; + "expected[g]" string => "$(G.testdir)/a,$(G.testdir)/bc,$(G.testdir)/d/,$(G.testdir)/g/,$(G.testdir)/klm/,$(G.testdir)/tu/,$(G.testdir)/d/e/,$(G.testdir)/g/h/,$(G.testdir)/klm/nop/,$(G.testdir)/tu/*,$(G.testdir)/d/e/f,$(G.testdir)/g/h/i/,$(G.testdir)/klm/nop/qrs,$(G.testdir)/g/h/i/j"; "expected[h]" string => "$(G.testdir)/g/h/i/j"; windows:: "expected[a]" string => "$(G.testdir)\\a,$(G.testdir)\\d,$(G.testdir)\\g"; diff --git a/tests/acceptance/01_vars/02_functions/findfiles_up.cf b/tests/acceptance/01_vars/02_functions/findfiles_up.cf index f05fcc72cc..98c2a564bd 100755 --- a/tests/acceptance/01_vars/02_functions/findfiles_up.cf +++ b/tests/acceptance/01_vars/02_functions/findfiles_up.cf @@ -74,12 +74,12 @@ bundle agent check ); "c3" expression => and( - strcmp("$(G.testdir)\\core\\libntech\\.git", "$(test.t3[0])"), - strcmp("$(G.testdir)\\core\\.git", "$(test.t3[1])") + strcmp("$(G.testdir)\\core\\libntech\\.git\\", "$(test.t3[0])"), + strcmp("$(G.testdir)\\core\\.git\\", "$(test.t3[1])") ); "c4" expression => and( - strcmp("$(G.testdir)\\core\\libntech\\.git", "$(test.t4[0])"), + strcmp("$(G.testdir)\\core\\libntech\\.git\\", "$(test.t4[0])"), not(isvariable("test.t4[1]")) ); "c5" @@ -106,12 +106,12 @@ bundle agent check ); "c3" expression => and( - strcmp("$(G.testdir)/core/libntech/.git", "$(test.t3[0])"), - strcmp("$(G.testdir)/core/.git", "$(test.t3[1])") + strcmp("$(G.testdir)/core/libntech/.git/", "$(test.t3[0])"), + strcmp("$(G.testdir)/core/.git/", "$(test.t3[1])") ); "c4" expression => and( - strcmp("$(G.testdir)/core/libntech/.git", "$(test.t4[0])"), + strcmp("$(G.testdir)/core/libntech/.git/", "$(test.t4[0])"), not(isvariable("test.t4[1]")) ); "c5"