summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-10Merge "Rename libext2 host libraries to standard suffix."brillo-m8-releasebrillo-m8-devAlex Deymo
2015-12-10Merge "bootctl: add is-slot-marked-successful command."David Zeuthen
2015-12-10bootctl: add is-slot-marked-successful command.David Zeuthen
This makes it easy to call the newly added isSlotMarkedSuccessful() boot_control HAL method added in the CL at https://android-review.googlesource.com/#/c/185841/ This is useful for e.g. test suites. Also improve error reporting for is-slot-bootable command. Change-Id: I603e07d8310fc1de88114dadbaa1622a76289afb Test: tested on edison (Brillo).
2015-12-10Merge "Move CreateSocketPair to net_test.py so we can use it elsewhere."Lorenzo Colitti
2015-12-09Rename libext2 host libraries to standard suffix.Alex Deymo
libext2_uuid_host was renamed to libext2_uuid-host to match the "-host" suffix used in most libraries. Bug: 24619596 TEST=m Change-Id: Ia417e1e65fa7ee54baac1007c057fe2571bf8196
2015-12-09Move CreateSocketPair to net_test.py so we can use it elsewhere.Lorenzo Colitti
Change-Id: Ic46e1b9ffb9d1d6082c0453baaad71a3d43b432f
2015-12-09Merge "Minor changes to netlink code."Lorenzo Colitti
2015-12-09Minor changes to netlink code.Lorenzo Colitti
1. Remove IpRoute._Debug, since it's identical to the superclass version. 2. Add some setsockopt constants to netlink.py. 3. Do the right thing if the kernel returns an error in a dump request. Change-Id: I37e49b35f1366760a408c7c4a73f95164d796a2e
2015-12-09Merge "Simpleperf: check value returned by fopen."Yabin Cui
2015-12-08Simpleperf: check value returned by fopen.Yabin Cui
Change-Id: Iecddf0b7805ccc2ad930bab2cdfcefa0702e5661
2015-12-09Merge "Simpleperf: check if elf file paths are valid before reading them."Yabin Cui
2015-12-08Simpleperf: check if elf file paths are valid before reading them.Yabin Cui
Reading invalid file paths can cause troubles. For example, reading /dev/zero can eat all memory. Bug: 25194400 Change-Id: I4de17f4f9200a43b50a4efe4c42a6fd9eaec1ba6
2015-12-08Merge "Prevent future instances of the last bug."Elliott Hughes
2015-12-08Prevent future instances of the last bug.Elliott Hughes
Also make the columns line up, and make it visible in the code that they do now line up. Bug: http://b/26084907 Change-Id: If6abfffcafceab8e8d548c93fbbb13e371c79732
2015-12-08Merge "Fix showmap SIGSEGV."Elliott Hughes
2015-12-08Fix showmap SIGSEGV.Elliott Hughes
Bug: http://b/26084907 Change-Id: I6ed8a26b93d90348d2bb806ccd7752a1a76144a6
2015-12-08Merge "Showmap: show swap."Elliott Hughes
2015-12-08Showmap: show swap.Martijn Coenen
Bug: 26019993 Change-Id: I50a22a6be958dc336da0a1942989a164bb489937
2015-12-08Merge "Simpleperf: add separate cpu_hotplug_test."Yabin Cui
2015-12-08Simpleperf: add separate cpu_hotplug_test.Yabin Cui
cpu_hotplug_test runs much longer than unit tests, so separate it. It uses the same strategy as the shell scripts I used to find all kernel bugs. Bug: 26032318 Bug: 25193162 Change-Id: I2f26d4f0d65e680b597e40cce9e775b9568599ef
2015-12-04Merge "Simpleperf: don\'t use ioctl(PERF_EVENT_IOC_ENABLE)."Yabin Cui
am: b9ca50b319 * commit 'b9ca50b319d2083c5a92c468e54796b0e71a4ad9': Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE).
2015-12-05Merge "Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE)."Yabin Cui
2015-12-04Merge "Track rename from base/ to android-base/."Elliott Hughes
am: 5d8fdbb6ff * commit '5d8fdbb6ff3d617e48198e12a2b1c10b48d22f79': Track rename from base/ to android-base/.
2015-12-04Merge "Track rename from base/ to android-base/."Elliott Hughes
2015-12-04Track rename from base/ to android-base/.Elliott Hughes
Change-Id: Ic15d4778c7accd1382de0b440a437aba2cf67016
2015-12-03Simpleperf: don't use ioctl(PERF_EVENT_IOC_ENABLE).Yabin Cui
Some android kernels(like bullhead/angler) can't handle ioctl(PERF_EVENT_IOC_ENABLE) correctly when cpu-hotplug happens. Instead of fixing all of them in kernel, we can't simply don't use it. Bug: 25193162 Change-Id: I9df1458045ffd2ccc2c7ba393e746ebba7c253de
2015-11-25Merge "Simpleperf: remove unnecessary exit()."Yabin Cui
am: dd7f62ed57 * commit 'dd7f62ed576e70e73a92b278c99dcba0d27f33a5': Simpleperf: remove unnecessary exit().
2015-11-25Merge "Simpleperf: remove unnecessary exit()."Yabin Cui
2015-11-24Simpleperf: remove unnecessary exit().Yabin Cui
Change-Id: I5256617373c3414195a7a994d0ce217d9afd47e6
2015-11-23Merge "zram performance test."Riley Andrews
am: bb0eca64ee * commit 'bb0eca64eea52340daf187a6e5908a6f27875e0a': zram performance test.
2015-11-23Merge "zram performance test."Riley Andrews
2015-11-23zram performance test.Riley Andrews
Test dumps raw read and write performance to the zram device. It will turn off the swap, benchmark, and then restore the swap device during a successful run. Signed-off-by: Riley Andrews <riandrews@google.com> Change-Id: I9b5474b5f0a7556ca2093f3f0d1f792fa2fb1514
2015-11-20Merge "bootctl: Fix the error checking for strtol result."Tao Bao
am: de2ad9750a * commit 'de2ad9750aa29f696ca94a4ec4fa1286293ef72d': bootctl: Fix the error checking for strtol result.
2015-11-20Merge "bootctl: Fix the error checking for strtol result."Tao Bao
2015-11-19bootctl: Fix the error checking for strtol result.Tao Bao
system/extras/bootctl/bootctl.c:136:13: warning: comparison is always false due to limited range of data type [-Wtype-limits] if (ret == LONG_MIN || ret == LONG_MAX) { Change-Id: Id4816716e4c6d304c2ca531aadbcc62117ad7376
2015-11-19Merge "fec: report correct ecc location for -E"Sami Tolvanen
am: 139871346e * commit '139871346e1b113f2d396fcc2e5b9ca20123d96f': fec: report correct ecc location for -E
2015-11-19Merge "fec: report correct ecc location for -E"Sami Tolvanen
2015-11-18fec: report correct ecc location for -ESami Tolvanen
Since the header is now at the end, no need to take that into account when reporting metadata location. Change-Id: I825b5ae9d35b3ca69dead37f246568b4700298a2
2015-11-17Merge "Alloc stress."Riley Andrews
am: 6978131b78 * commit '6978131b781d16e6911fa51f68e101abe225de5c': Alloc stress.
2015-11-17Merge "Alloc stress."Riley Andrews
2015-11-16Alloc stress.Riley Andrews
Change-Id: Ib1b506ef43aea122a76dac80d1eaf819c81073b1
2015-11-12Merge "Fix a size specification bug for the bandwidth test."Christopher Ferris
am: df6a677fac * commit 'df6a677fac4e74723de43c1ad8540c9bdd0d6ad4': Fix a size specification bug for the bandwidth test.
2015-11-12Merge "Fix a size specification bug for the bandwidth test."Christopher Ferris
2015-11-12Fix a size specification bug for the bandwidth test.Ben Cheng
Change-Id: I38b5dc89edafd1768caa34158c2746c7ef35c31e (cherry picked from commit fb829a48d844b9769c5a52d1bb4d40d51ff4b6bc)
2015-11-09Merge "Do not try and sanitize memtest."Christopher Ferris
am: 442e95221f * commit '442e95221fb7fa4e98dab788b0382140843e32a1': Do not try and sanitize memtest.
2015-11-09Merge "Do not try and sanitize memtest."Christopher Ferris
2015-11-09Do not try and sanitize memtest.Christopher Ferris
Bug: 25592757 Change-Id: I944bdabd7026251d903f9e3441859401fdcb872f
2015-11-09Merge "Use packets.py instead of old multinetwork_test.Packets"Erik Kline
am: e883d56794 * commit 'e883d56794a07c09eb889e8a1bd51a963c3fc7b2': Use packets.py instead of old multinetwork_test.Packets
2015-11-09Merge "Use packets.py instead of old multinetwork_test.Packets"Erik Kline
2015-11-09Use packets.py instead of old multinetwork_test.PacketsErik Kline
Change-Id: I39a36569a2df5b2a2a5b2bb323944864b284df0a
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 07:01:11 +0000