diff options
author | Ji Won Shin <jiwonshin@google.com> | 2018-09-04 14:48:10 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-09-04 14:48:10 -0700 |
commit | 6419b33531d93c34d9014fa84a0aa7b68980a527 (patch) | |
tree | 18b31018e16bdd4bd2ae0222fa82c456be963fa4 | |
parent | 6f8a3cf34e07fc3c2362c0ab430275afeac38c2b (diff) | |
parent | 0e16b38c0534741b94dfd69c87563edc8fdd2438 (diff) | |
download | fuzz-pie-temp.tar.gz |
Remove tempdirs used by HAL fuzz test and kernel fuzz test am: 56ca31a154pie-temp
am: 0e16b38c05
Change-Id: I0da8ec0d56b8e2f344fc30b7baf1e407de26395e
-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( |