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

Commit 124d980a authored by David Anderson's avatar David Anderson
Browse files

libsnapshot: Test more configurations in presubmit. 

Take 2: remove the shell script, which wasn't working very well, and
just provide different builds of the same binary.

Bug: 208944665
Test: presubmit
Change-Id: I994a93e4e364bc210ddd2eb60025c656caa86b1c
parent 1e53806a

fs_mgr/TEST_MAPPING

+12 −0
Original line number Diff line number Diff line
@@ -21,6 +21,12 @@ 
    {

      "name": "vts_libsnapshot_test"

    },

    {

      "name": "vab_legacy_tests"

    },

    {

      "name": "vabc_legacy_tests"

    },

    {

      "name": "libsnapshot_fuzzer_test"

    },
@@ -37,6 +43,12 @@ 
    },

    {

      "name": "vts_libsnapshot_test"

    },

    {

      "name": "vab_legacy_tests"

    },

    {

      "name": "vabc_legacy_tests"

    }

  ]

}

fs_mgr/libsnapshot/Android.bp

+12 −7
Original line number Diff line number Diff line
@@ -269,14 +269,19 @@ cc_test { 
    defaults: ["libsnapshot_test_defaults", "libsnapshot_hal_deps"],

}



sh_test {

    name: "run_snapshot_tests",

    src: "run_snapshot_tests.sh",

    test_suites: [

        "device-tests",

cc_test {

    name: "vab_legacy_tests",

    defaults: ["libsnapshot_test_defaults", "libsnapshot_hal_deps"],

    cppflags: [

        "-DLIBSNAPSHOT_TEST_VAB_LEGACY",

    ],

    required: [

        "vts_libsnapshot_test",

}



cc_test {

    name: "vabc_legacy_tests",

    defaults: ["libsnapshot_test_defaults", "libsnapshot_hal_deps"],

    cppflags: [

        "-DLIBSNAPSHOT_TEST_VABC_LEGACY",

    ],

}

fs_mgr/libsnapshot/run_snapshot_tests.sh

deleted100644 → 0
+0 −35
Original line number Diff line number Diff line 
#!/system/bin/sh



# Detect host or AOSP.

getprop ro.build.version.sdk > /dev/null 2>&1

if [ $? -eq 0 ]; then

    cmd_prefix=""

    local_root=""

else

    cmd_prefix="adb shell"

    local_root="${ANDROID_PRODUCT_OUT}"

    set -e

    set -x

    adb root

    adb sync data

    set +x

    set +e

fi



testpath64="/data/nativetest64/vts_libsnapshot_test/vts_libsnapshot_test"

testpath32="/data/nativetest/vts_libsnapshot_test/vts_libsnapshot_test"

if [ -f "${local_root}/${testpath64}" ]; then

    testpath="${testpath64}"

elif [ -f "${local_root}/${testpath32}" ]; then

    testpath="${testpath32}"

else

    echo "ERROR: vts_libsnapshot_test not found." 1>&2

    echo "Make sure to build vts_libsnapshot_test or snapshot_tests first." 1>&2

    exit 1

fi



# Verbose, error on failure.

set -x

set -e



time ${cmd_prefix} ${testpath}

fs_mgr/libsnapshot/snapshot_test.cpp

+9 −1
Original line number Diff line number Diff line
@@ -53,7 +53,15 @@ 
#include <libsnapshot/mock_device_info.h>

#include <libsnapshot/mock_snapshot.h>



DEFINE_string(force_mode, "",

#if defined(LIBSNAPSHOT_TEST_VAB_LEGACY)

#define DEFAULT_MODE "vab-legacy"

#elif defined(LIBSNAPSHOT_TEST_VABC_LEGACY)

#define DEFAULT_MODE "vabc-legacy"

#else

#define DEFAULT_MODE ""

#endif



DEFINE_string(force_mode, DEFAULT_MODE,

              "Force testing older modes (vab-legacy, vabc-legacy) ignoring device config.");

DEFINE_string(force_iouring_disable, "",

              "Force testing mode (iouring_disabled) - disable io_uring");