Skip to content

Renamed plucked.cf.sub to plucked.sub.cf #6104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
olehermanse merged 2 commits into from
May 1, 2026
Merged

Renamed plucked.cf.sub to plucked.sub.cf #6104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce3639b
Renamed plucked.cf.sub to plucked.sub.cf
olehermanse Apr 30, 2026
d5669ee
testall: Adjusted to skip .sub.cf files
olehermanse Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tests/acceptance/08_commands/01_modules/001.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

body common control
{
inputs => { "../../default.cf.sub", "../../plucked.cf.sub" };
inputs => { "../../default.cf.sub", "../../plucked.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/08_commands/01_modules/002.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

body common control
{
inputs => { "../../default.cf.sub", "../../plucked.cf.sub" };
inputs => { "../../default.cf.sub", "../../plucked.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/08_commands/01_modules/003.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

body common control
{
inputs => { "../../default.cf.sub", "../../plucked.cf.sub" };
inputs => { "../../default.cf.sub", "../../plucked.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/08_commands/01_modules/004.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

body common control
{
inputs => { "../../default.cf.sub", "../../plucked.cf.sub" };
inputs => { "../../default.cf.sub", "../../plucked.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/08_commands/01_modules/set-context.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

body common control
{
inputs => { "../../default.cf.sub", "../../plucked.cf.sub" };
inputs => { "../../default.cf.sub", "../../plucked.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/08_commands/01_modules/set-persistent-class.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

body common control
{
inputs => { "../../default.cf.sub", "../../plucked.cf.sub" };
inputs => { "../../default.cf.sub", "../../plucked.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/08_commands/01_modules/set-tags.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

body common control
{
inputs => { "../../default.cf.sub", "../../plucked.cf.sub" };
inputs => { "../../default.cf.sub", "../../plucked.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion ...s/acceptance/08_commands/01_modules/vars-from-module-have-source-and-derived_from-tags.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body common control
{
inputs => { "../../default.cf.sub", "../../plucked.cf.sub" };
inputs => { "../../default.cf.sub", "../../plucked.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/08_commands/01_modules/vars-without-explicit-tags-do-not-segfault.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body common control
{
inputs => { "../../default.cf.sub", "../../plucked.cf.sub" };
inputs => { "../../default.cf.sub", "../../plucked.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/10_files/02_maintain/changes_depth_search.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
body common control
{
inputs => { "../../dcs.cf.sub",
"../../plucked.cf.sub",
"../../plucked.sub.cf",
"check_file_changes_log.cf.sub",
};
bundlesequence => { default("$(this.promise_filename)") };
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/10_files/02_maintain/changes_depth_search.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
body common control
{
inputs => { "../../dcs.cf.sub",
"../../plucked.cf.sub",
"../../plucked.sub.cf",
};
bundlesequence => { "init", "test" };
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
body common control
{
inputs => { "../../dcs.cf.sub",
"../../plucked.cf.sub",
"../../plucked.sub.cf",
"check_file_changes_log.cf.sub",
};
bundlesequence => { default("$(this.promise_filename)") };
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/10_files/02_maintain/changes_depth_search_last_file.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
body common control
{
inputs => { "../../dcs.cf.sub",
"../../plucked.cf.sub",
"../../plucked.sub.cf",
};
bundlesequence => { "init", "test" };
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/10_files/02_maintain/check_file_changes_log.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

body file control
{
inputs => { "../../plucked.cf.sub" };
inputs => { "../../plucked.sub.cf" };
}

bundle agent check_file_changes_log(file, pass_class, fail_class, checks)
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/10_files/templating/missing_template_file.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

body common control
{
inputs => { "../../default.cf.sub", "../../plucked.cf.sub" };
inputs => { "../../default.cf.sub", "../../plucked.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
version => "1.0";
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/10_files/templating/mustache_section.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body common control
{
inputs => { "../../plucked.cf.sub" };
inputs => { "../../plucked.sub.cf" };
bundlesequence => { test };
version => "1.0";
}
Expand Down
4 changes: 2 additions & 2 deletions tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@

body common control
{
inputs => { "../../../dcs.cf.sub", "../../../plucked.cf.sub" };
inputs => { "../../../dcs.cf.sub", "../../../plucked.sub.cf" };
bundlesequence => { default($(this.promise_filename)) };
}

bundle agent test
{

commands:
# Note, no -K, we are testing locks.
"$(sys.cf_agent) -v -D AUTO,DEBUG -f $(this.promise_filename).sub"
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/10_files/templating/timed/expired_edit_line_locks.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body common control
{
inputs => { "../../../dcs.cf.sub", "../../../plucked.cf.sub" };
inputs => { "../../../dcs.cf.sub", "../../../plucked.sub.cf" };
bundlesequence => { default($(this.promise_filename)) };
}

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/17_users/unsafe/disable_sudo_tty_requirement.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

body file control
{
inputs => { "../../plucked.cf.sub" };
inputs => { "../../plucked.sub.cf" };
}

bundle agent disable_sudo_tty_requirement
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/23_failsafe/preexisting_failsafe_preserved.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

body common control
{
inputs => { "../default.cf.sub", "../plucked.cf.sub" };
inputs => { "../default.cf.sub", "../plucked.sub.cf" };
bundlesequence => { default("$(this.promise_filename)") };
}

Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/29_simulate_mode/simulate_safe_functions.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
body common control
{
inputs => { "../plucked.cf.sub" };
inputs => { "../plucked.sub.cf" };
}

bundle agent test
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ check-local:
+ $(TESTS_ENVIRONMENT) MAKE=$(MAKE) $(srcdir)/testall


EXTRA_DIST = default.cf.sub dcs.cf.sub plucked.cf.sub run_with_server.cf.sub \
EXTRA_DIST = default.cf.sub dcs.cf.sub plucked.sub.cf run_with_server.cf.sub \
testall dummy_etc write_args.sh \
root-MD5=617eb383deffef843ea856b129d0a423.pub \
root-MD5=617eb383deffef843ea856b129d0a423.priv
Expand All @@ -109,5 +109,5 @@ dist-hook:
CLEANFILES = *.gcno *.gcda Makefile.testall

pluck:
echo '### This is an auto-generated file, see Makefile.am and `make pluck` ###' > plucked.cf.sub
../../contrib/cf-locate/cf-locate -f -p '( if_|run_|warn_only|INI_section|kept_successful_command|edit_line|set_user_field|set_variable_values\(|edit_field|set_line_based|location|replace_with|_cp|_dcp|empty|shell|immediate|perms| m\b|recurse|tidy| all|classes_generic|results| start|always|^value|edit_field line|insert_lines|(link|copy)from| file_mustache| (file|dir)_(copy|tidy|sync|make|empty|link|hardlink))' ../../../masterfiles/lib/*.cf >> plucked.cf.sub
echo '### This is an auto-generated file, see Makefile.am and `make pluck` ###' > plucked.sub.cf
../../contrib/cf-locate/cf-locate -f -p '( if_|run_|warn_only|INI_section|kept_successful_command|edit_line|set_user_field|set_variable_values\(|edit_field|set_line_based|location|replace_with|_cp|_dcp|empty|shell|immediate|perms| m\b|recurse|tidy| all|classes_generic|results| start|always|^value|edit_field line|insert_lines|(link|copy)from| file_mustache| (file|dir)_(copy|tidy|sync|make|empty|link|hardlink))' ../../../masterfiles/lib/*.cf >> plucked.sub.cf
4 changes: 2 additions & 2 deletions tests/acceptance/default.cf.sub
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ bundle common D
"inputs"
slist => {
"$(D.owndir)$(const.dirsep)dcs.cf.sub",
"$(D.owndir)$(const.dirsep)plucked.cf.sub",
"$(D.owndir)$(const.dirsep)plucked.sub.cf",
};

# If testing the masterfiles policy framework then load the stdlib by
Expand All @@ -35,6 +35,6 @@ bundle common D

body file control
{
# plucked.cf.sub comes from the stdlib with `make pluck`
# plucked.sub.cf comes from the stdlib with `make pluck`
inputs => { @(D.inputs) };
}
0 tests/acceptance/plucked.cf.sub → tests/acceptance/plucked.sub.cf
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/acceptance/testall
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1059,13 +1059,13 @@ then
ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$test"
elif [ -d $test ]
then
ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$(find "$test" -name workdir -prune -o -name '*.cf' -print | sort)"
ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$(find "$test" -name workdir -prune -o -name '*.cf' -and -not -name '*.sub.cf' -print | sort)"
else
echo "Unable to open test file/directory: $test"
fi
done
else
ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$(find . \( -name selftest -o -name workdir \) -prune -o -name '*.cf' -print | sort)"
ALL_TESTS="$ALL_TESTS${ALL_TESTS:+ }$(find . \( -name selftest -o -name workdir \) -prune -o -name '*.cf' -and -not -name '*.sub.cf' -print | sort)"
fi

for addtest in $ALL_TESTS
Expand Down
Loading