Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4a5240e authored by Sam Delmerico's avatar Sam Delmerico Committed by Gerrit Code Review
Browse files

Merge changes I5e887932,I648960b3 

* changes:
  re-enable b run commands in test suite
  re-enable b test suite
parents 1bcc569e d0c8cf02

envsetup.sh

+6 −8
Original line number Diff line number Diff line
@@ -1844,6 +1844,11 @@ function _trigger_build() 
# Convenience entry point (like m) to use Bazel in AOSP.

function b()

(

    # zsh breaks posix by not doing string-splitting on unquoted args by default.

    # See https://zsh.sourceforge.io/Guide/zshguide05.html section 5.4.4.

    # Tell it to emulate Bourne shell for this function.

    if [ -n "$ZSH_VERSION" ]; then emulate -L sh; fi



    # Look for the --run-soong-tests flag and skip passing --skip-soong-tests to Soong if present

    local bazel_args=""

    local skip_tests="--skip-soong-tests"
@@ -1883,15 +1888,8 @@ function b() 
        fi



        # Call Bazel.

        if [ -n "$ZSH_VERSION" ]; then

            # zsh breaks posix by not doing string-splitting on unquoted args

            # by default. Explicitly use the "=" flag to split.

            # See https://zsh.sourceforge.io/Guide/zshguide05.html section 5.4.4.

            bazel ${=bazel_args_with_config}

        else

        bazel ${bazel_args_with_config[@]}

    fi

    fi

)



function m()

tests/b_tests.sh

+2 −5
Original line number Diff line number Diff line
@@ -20,12 +20,9 @@ source $(dirname $0)/../envsetup.sh 


test_target=//build/bazel/scripts/difftool:difftool



b cquery 'kind(test, //build/bazel/...)'

b build "$test_target"

b build "$test_target" --run-soong-tests

b build --run-soong-tests "$test_target"

b --run-soong-tests build "$test_target"

b run $test_target

b run $test_target -- --help

b cquery --output=build 'kind(test, //build/bazel/...)'

b cquery 'kind(test, //build/bazel/...)' --output=build
 
b cquery 'kind(test, //build/bazel/examples/android_app/...)' --config=android

b run $test_target -- --help >/dev/null

tests/roboleaf_tests.sh

+0 −2
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



exit 0 #TODO(b/244771600) remove this after CI is enabled



tests=(

 $(dirname $0)/b_tests.sh

)