From 61a0f8f9cc2592dc39bb71a88c61d8da05771da0 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sat, 13 Mar 2021 18:27:11 +0200
Subject: [PATCH 1/2] test: Cleanup test files in
 test-{security,symbol}-check.py

---
 contrib/devtools/test-security-check.py | 11 +++++++++++
 contrib/devtools/test-symbol-check.py   |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/contrib/devtools/test-security-check.py b/contrib/devtools/test-security-check.py
index ec2d886653..28b5f57489 100755
--- a/contrib/devtools/test-security-check.py
+++ b/contrib/devtools/test-security-check.py
@@ -5,6 +5,7 @@
 '''
 Test script for security-check.py
 '''
+import os
 import subprocess
 import unittest
 
@@ -19,6 +20,10 @@ def write_testcode(filename):
     }
     ''')
 
+def clean_files(source, executable):
+    os.remove(source)
+    os.remove(executable)
+
 def call_security_check(cc, source, executable, options):
     subprocess.run([cc,source,'-o',executable] + options, check=True)
     p = subprocess.run(['./contrib/devtools/security-check.py',executable], stdout=subprocess.PIPE, universal_newlines=True)
@@ -44,6 +49,8 @@ class TestSecurityChecks(unittest.TestCase):
         self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-znoexecstack','-fstack-protector-all','-Wl,-zrelro','-Wl,-z,now','-pie','-fPIE', '-Wl,-z,separate-code']),
                 (0, ''))
 
+        clean_files(source, executable)
+
     def test_PE(self):
         source = 'test1.c'
         executable = 'test1.exe'
@@ -61,6 +68,8 @@ class TestSecurityChecks(unittest.TestCase):
         self.assertEqual(call_security_check(cc, source, executable, ['-Wl,--nxcompat','-Wl,--dynamicbase','-Wl,--high-entropy-va','-pie','-fPIE']),
             (0, ''))
 
+        clean_files(source, executable)
+
     def test_MACHO(self):
         source = 'test1.c'
         executable = 'test1'
@@ -80,6 +89,8 @@ class TestSecurityChecks(unittest.TestCase):
         self.assertEqual(call_security_check(cc, source, executable, ['-Wl,-pie','-Wl,-bind_at_load','-fstack-protector-all']),
             (0, ''))
 
+        clean_files(source, executable)
+
 if __name__ == '__main__':
     unittest.main()
 
diff --git a/contrib/devtools/test-symbol-check.py b/contrib/devtools/test-symbol-check.py
index ee7bfc9805..6bea5d90f8 100755
--- a/contrib/devtools/test-symbol-check.py
+++ b/contrib/devtools/test-symbol-check.py
@@ -5,12 +5,15 @@
 '''
 Test script for symbol-check.py
 '''
+import os
 import subprocess
 import unittest
 
 def call_symbol_check(cc, source, executable, options):
     subprocess.run([cc,source,'-o',executable] + options, check=True)
     p = subprocess.run(['./contrib/devtools/symbol-check.py',executable], stdout=subprocess.PIPE, universal_newlines=True)
+    os.remove(source)
+    os.remove(executable)
     return (p.returncode, p.stdout.rstrip())
 
 def get_machine(cc):

From 0fc0c00f7ab1a90bf673ba1a01b021d3b1fa7df0 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Sat, 13 Mar 2021 18:29:08 +0200
Subject: [PATCH 2/2] test: Drop unused get_machine function

The removed get_machine function is no longer used since #21255.
---
 contrib/devtools/test-symbol-check.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/contrib/devtools/test-symbol-check.py b/contrib/devtools/test-symbol-check.py
index 6bea5d90f8..106dfd2c5a 100755
--- a/contrib/devtools/test-symbol-check.py
+++ b/contrib/devtools/test-symbol-check.py
@@ -16,10 +16,6 @@ def call_symbol_check(cc, source, executable, options):
     os.remove(executable)
     return (p.returncode, p.stdout.rstrip())
 
-def get_machine(cc):
-    p = subprocess.run([cc,'-dumpmachine'], stdout=subprocess.PIPE, universal_newlines=True)
-    return p.stdout.rstrip()
-
 class TestSymbolChecks(unittest.TestCase):
     def test_ELF(self):
         source = 'test1.c'