diff --git a/resources/build/test/test.sh b/resources/build/test/test.sh index c6623e45ae..4cb78ab2c2 100755 --- a/resources/build/test/test.sh +++ b/resources/build/test/test.sh @@ -18,7 +18,7 @@ cd "$THIS_SCRIPT_PATH" builder_describe - clean build builder_parse "build" if [[ "${_builder_chosen_action_targets[@]}" != "build:project" ]]; then - builder_die " Test: builder_parse, shorthand form 'build' should give us 'build:project'" + builder_die " Test: builder_parse, shorthand form 'build' should give us 'build:project" fi if builder_start_action build; then @@ -44,7 +44,7 @@ builder_describe_parse_short_test() { fi } -builder_describe_parse_short_test "clean build test" ":module :tools :app" "build:module build:tools build:app build:project" "build" +builder_describe_parse_short_test "clean build test" ":module :tools :app" "build:module build:tools build:app" "build" builder_describe_parse_short_test "clean build test" ":module :tools :app" "build:app" "build:app" builder_describe_parse_short_test "clean build test" ":module :tools :app" "build:app clean:module" "build:app clean:module" builder_describe_parse_short_test "clean build test" ":module :tools :app :project" "clean:module clean:tools clean:app clean:project build:app build:project" "clean build:app build:project" @@ -113,23 +113,6 @@ builder_describe \ "--zoom,-z Use zoom mode" \ "--feature=FOO Enable feature foo" -#---------------------------------------------------------------------- -# Test implicit :project targets - -builder_parse_test "clean:app test:engine" "" clean:app test:engine - -if builder_has_action test:project; then - builder_die "FAIL: test:project should not have matched project-wide test action" -fi - -builder_parse_test "clean:app test:app test:engine test:project" "" clean:app test - -if builder_has_action test:project; then - echo "PASS: test:project matched" -else - builder_die: "FAIL: test:project missing for untargeted test action" -fi - #---------------------------------------------------------------------- # Test --options diff --git a/resources/builder.inc.sh b/resources/builder.inc.sh index a63d75c681..8713a54531 100755 --- a/resources/builder.inc.sh +++ b/resources/builder.inc.sh @@ -1302,11 +1302,8 @@ _builder_parse_expanded_parameters() { for e in "${_builder_targets[@]}"; do _builder_chosen_action_targets+=("$action$e") done - - if ! _builder_item_in_array ":project" "${_builder_targets[@]}"; then - # Also include an action-target pair indicating that the non-targeted action was specified. - _builder_chosen_action_targets+=("$action:project") - fi + # Also include an action-target pair indicating that the non-targeted action was specified. + _builder_chosen_action_targets+=("$action:project") elif (( has_target )); then # apply the default action to the selected target