diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-02-11 15:13:09 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-11 15:13:09 -0800 |
| commit | ad27053afb5459098881b8e35f8ed2bfc02dd925 (patch) | |
| tree | 3b5822ef894a7b92868dac5fec19a80b6355c2d8 | |
| parent | 8a977fbda674c716bc2c702913ef75ef8d3ac012 (diff) | |
| parent | 5e750b0e0bd66f7360ad3280c60598daed3b8a56 (diff) | |
| download | platform_test_vts-testcase_fuzz-pie-cuttlefish-testing.tar.gz platform_test_vts-testcase_fuzz-pie-cuttlefish-testing.tar.bz2 platform_test_vts-testcase_fuzz-pie-cuttlefish-testing.zip | |
Snap for 5180536 from 9a6ffe363a0b7b1626d8e609da4aed4b06d2b079 to pi-platform-releasepie-cuttlefish-testing
am: 5e750b0e0b
Change-Id: I5dc53e7d9c901512b174e866aa1cd6aada79042a
| -rw-r--r-- | kernel/syzkaller/syzkaller_test.py | 9 | ||||
| -rw-r--r-- | template/libfuzzer_test/libfuzzer_test.py | 13 |
2 files changed, 21 insertions, 1 deletions
diff --git a/kernel/syzkaller/syzkaller_test.py b/kernel/syzkaller/syzkaller_test.py index 5d30d73..d951592 100644 --- a/kernel/syzkaller/syzkaller_test.py +++ b/kernel/syzkaller/syzkaller_test.py @@ -143,6 +143,15 @@ class SyzkallerTest(base_test.BaseTestClass): asserts.fail('%s caused crash in our device.', test_case._test_name) + def tearDownClass(self): + """Removes the temporary directory used for Syzkaller.""" + logging.debug('Temporary directory %s is being deleted', + self._env['temp_dir']) + try: + shutil.rmtree(self._env['temp_dir']) + except OSError as e: + logging.exception(e) + def generateKernelFuzzerTests(self): """Runs kernel fuzzer tests.""" self.FetchSyzkaller() diff --git a/template/libfuzzer_test/libfuzzer_test.py b/template/libfuzzer_test/libfuzzer_test.py index ba4ea03..28137c5 100644 --- a/template/libfuzzer_test/libfuzzer_test.py +++ b/template/libfuzzer_test/libfuzzer_test.py @@ -17,6 +17,7 @@ import logging import os +import shutil from vts.runners.host import asserts from vts.runners.host import base_test @@ -183,7 +184,8 @@ class LibFuzzerTest(base_test.BaseTestClass): inuse_seed = self.RetrieveCorpusSeed(test_case) if inuse_seed == 'locked': # skip this test case - logging.warning('test case locked, skipping testcase %s.', test_case.test_name) + logging.warning('test case locked, skipping testcase %s.', + test_case.test_name) return fuzz_cmd = '"%s"' % test_case.GetRunCommand() @@ -275,6 +277,15 @@ class LibFuzzerTest(base_test.BaseTestClass): elif exit_code != config.ExitCode.FUZZER_TEST_PASS: asserts.fail('%s failed abnormally.' % test_case.test_name) + def tearDownClass(self): + """Removes the temporary directory used for corpus management.""" + logging.debug('Temporary directory %s is being deleted', + self._temp_dir) + try: + shutil.rmtree(self._temp_dir) + except OSError as e: + logging.exception(e) + def generateFuzzerTests(self): """Runs fuzzer tests.""" self.runGeneratedTests( |