[PATCH] D119096: [llvm] [Debuginfod] Remove `llvm-debuginfod-find` lit tests that used python http server.
Noah Shutty via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Sun Feb 6 15:07:03 PST 2022
noajshu created this revision.
noajshu added reviewers: phosek, dblaikie.
noajshu requested review of this revision.
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.
These lit tests of the `llvm-debuginfod-find` client are not needed after D114846 <https://reviews.llvm.org/D114846>, which already tests the client against the server.
These tests depend on `ThreadingHTTPServer` which was not introduced until python 3.7 <https://reviews.llvm.org/D112759#3271718> so we might as well delete them to avoid issues.
https://reviews.llvm.org/D119096
Files:
llvm/test/tools/llvm-debuginfod-find/Inputs/buildid/abcdef/debuginfo
llvm/test/tools/llvm-debuginfod-find/Inputs/buildid/abcdef/executable
llvm/test/tools/llvm-debuginfod-find/Inputs/buildid/abcdef/source/directory/file.c
llvm/test/tools/llvm-debuginfod-find/debuginfod.test
Index: llvm/test/tools/llvm-debuginfod-find/debuginfod.test
===================================================================
--- llvm/test/tools/llvm-debuginfod-find/debuginfod.test
+++ /dev/null
@@ -1,77 +0,0 @@
-# REQUIRES: curl
-# RUN: rm -rf %t
-# RUN: mkdir %t
-# # Query the python server for artifacts
-# RUN: DEBUGINFOD_CACHE_PATH=%t %python %s --server-path %S/Inputs \
-# RUN: --tool-cmd 'llvm-debuginfod-find --dump --executable abcdef' | \
-# RUN: FileCheck %s --check-prefix=EXECUTABLE
-# RUN: DEBUGINFOD_CACHE_PATH=%t %python %s --server-path %S/Inputs \
-# RUN: --tool-cmd 'llvm-debuginfod-find --dump --source=/directory/file.c abcdef' | \
-# RUN: FileCheck %s --check-prefix=SOURCE
-# RUN: DEBUGINFOD_CACHE_PATH=%t %python %s --server-path %S/Inputs \
-# RUN: --tool-cmd 'llvm-debuginfod-find --dump --debuginfo abcdef' | \
-# RUN: FileCheck %s --check-prefix=DEBUGINFO
-
-# EXECUTABLE: fake_executable
-# SOURCE: int foo = 0;
-# DEBUGINFO: fake_debuginfo
-
-# # The artifacts should still be present in the cache without needing to query
-# # the server.
-# RUN: DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump --executable abcdef | \
-# RUN: FileCheck %s --check-prefix=EXECUTABLE
-# RUN: DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump \
-# RUN: --source=/directory/file.c abcdef | \
-# RUN: FileCheck %s --check-prefix=SOURCE
-# RUN: DEBUGINFOD_CACHE_PATH=%t llvm-debuginfod-find --dump --debuginfo abcdef | \
-# RUN: FileCheck %s --check-prefix=DEBUGINFO
-
-
-# This script is used to test the debuginfod client within a host tool.
-# It first stands up a Python HTTP static file server and then executes the tool.
-# This way the tool can make debuginfod HTTP requests to the static file server.
-import argparse
-import threading
-import http.server
-import functools
-import subprocess
-import sys
-import os
-
-
-# Serves files at the server_path, then runs the tool with specified args.
-# Sets the DEBUGINFOD_CACHE_PATH env var to point at the given cache_directory.
-# Sets the DEBUGINFOD_URLS env var to point at the local server.
-def test_tool(server_path, tool_args):
- httpd = http.server.ThreadingHTTPServer(
- ('',0), functools.partial(
- http.server.SimpleHTTPRequestHandler,
- directory=server_path))
- port = httpd.server_port
- thread = threading.Thread(target=httpd.serve_forever)
- try:
- thread.start()
- env = os.environ
- env['DEBUGINFOD_URLS'] = 'http://localhost:%s' % port
- process = subprocess.Popen(
- tool_args, env=env)
- code = process.wait()
- if code != 0:
- print('nontrivial return code %s' % code)
- return 1
- finally:
- httpd.shutdown()
- thread.join()
- return 0
-
-def main():
- parser = argparse.ArgumentParser()
- parser.add_argument('--server-path', default='./')
- parser.add_argument('--tool-cmd', required=True, type=str)
- args = parser.parse_args()
- result = test_tool(args.server_path,
- args.tool_cmd.split())
- sys.exit(result)
-
-if __name__ == '__main__':
- main()
Index: llvm/test/tools/llvm-debuginfod-find/Inputs/buildid/abcdef/source/directory/file.c
===================================================================
--- llvm/test/tools/llvm-debuginfod-find/Inputs/buildid/abcdef/source/directory/file.c
+++ /dev/null
@@ -1 +0,0 @@
-int foo = 0;
Index: llvm/test/tools/llvm-debuginfod-find/Inputs/buildid/abcdef/executable
===================================================================
--- llvm/test/tools/llvm-debuginfod-find/Inputs/buildid/abcdef/executable
+++ /dev/null
@@ -1 +0,0 @@
-fake_executable
Index: llvm/test/tools/llvm-debuginfod-find/Inputs/buildid/abcdef/debuginfo
===================================================================
--- llvm/test/tools/llvm-debuginfod-find/Inputs/buildid/abcdef/debuginfo
+++ /dev/null
@@ -1 +0,0 @@
-fake_debuginfo
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D119096.406297.patch
Type: text/x-patch
Size: 3951 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20220206/475a03b7/attachment.bin>
More information about the llvm-commits
mailing list