diff options
| author | Yabin Cui <yabinc@google.com> | 2022-11-29 18:16:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-29 18:16:22 +0000 |
| commit | fc88ba68bb8280e4eb2fe893cd6cebf44a043708 (patch) | |
| tree | 3955b0690a3eb689185100e8bdcfb03673ef6816 | |
| parent | 7d7fb52aedf28bbc4951900bde42cf301ffbb35e (diff) | |
| parent | fb93f923e01bae7f0805b00ecdd2e16eaadc2117 (diff) | |
| download | extras-fc88ba68bb8280e4eb2fe893cd6cebf44a043708.tar.gz | |
Merge "simpleperf: add etm data to fuzz corpus." am: fb93f923e0
Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2313382
Change-Id: I1e32279d665641676ab5947edac8f31b109d2c12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | simpleperf/Android.bp | 2 | ||||
| -rw-r--r-- | simpleperf/cmd_inject_test.cpp | 2 | ||||
| -rw-r--r-- | simpleperf/get_test_data.h | 2 | ||||
| -rw-r--r-- | simpleperf/testdata/etm/perf_etm.data (renamed from simpleperf/testdata/etm/perf.data) | bin | 12321 -> 12321 bytes |
4 files changed, 3 insertions, 3 deletions
diff --git a/simpleperf/Android.bp b/simpleperf/Android.bp index be3fe408..b16a32ad 100644 --- a/simpleperf/Android.bp +++ b/simpleperf/Android.bp @@ -738,5 +738,5 @@ cc_fuzz { enabled: false, }, }, - corpus: ["testdata/*.data"], + corpus: ["testdata/**/*.data"], } diff --git a/simpleperf/cmd_inject_test.cpp b/simpleperf/cmd_inject_test.cpp index f12d7479..6c6161c1 100644 --- a/simpleperf/cmd_inject_test.cpp +++ b/simpleperf/cmd_inject_test.cpp @@ -159,7 +159,7 @@ TEST(cmd_inject, unformatted_trace) { TEST(cmd_inject, multiple_input_files) { std::string data; - std::string perf_data = GetTestData(std::string("etm") + OS_PATH_SEPARATOR + "perf.data"); + std::string perf_data = GetTestData(PERF_DATA_ETM_TEST_LOOP); std::string perf_with_unformatted_trace = GetTestData(std::string("etm") + OS_PATH_SEPARATOR + "perf_with_unformatted_trace.data"); diff --git a/simpleperf/get_test_data.h b/simpleperf/get_test_data.h index 2711d5e4..a8acb059 100644 --- a/simpleperf/get_test_data.h +++ b/simpleperf/get_test_data.h @@ -144,6 +144,6 @@ static const std::string PERF_DATA_WITH_IP_ZERO_IN_CALLCHAIN = "perf_with_ip_zero_in_callchain.data"; // generated by `simpleperf record -e cs-etm:u ./etm_test_loop` -static const std::string PERF_DATA_ETM_TEST_LOOP = "etm/perf.data"; +static const std::string PERF_DATA_ETM_TEST_LOOP = "etm/perf_etm.data"; #endif // SIMPLE_PERF_GET_TEST_DATA_H_ diff --git a/simpleperf/testdata/etm/perf.data b/simpleperf/testdata/etm/perf_etm.data Binary files differindex 595443d0..595443d0 100644 --- a/simpleperf/testdata/etm/perf.data +++ b/simpleperf/testdata/etm/perf_etm.data |