Skip to content

Commit

Permalink
Revert "Add opt-viewer testing"
Browse files Browse the repository at this point in the history
This reverts commit r319073.

Bot fails with a mismatch that looks like pygments-generated HTML.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319146 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
anemet committed Nov 28, 2017
1 parent 8aaa99a commit 965e787
Show file tree
Hide file tree
Showing 12 changed files with 0 additions and 1,152 deletions.
31 changes: 0 additions & 31 deletions cmake/config-ix.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -628,34 +628,3 @@ else()
endif()

string(REPLACE " " ";" LLVM_BINDINGS_LIST "${LLVM_BINDINGS}")

function(find_python_module module)
string(TOUPPER ${module} module_upper)
set(FOUND_VAR PY_${module_upper}_FOUND)

execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" "import ${module}"
RESULT_VARIABLE status
ERROR_QUIET)

if(status)
set(${FOUND_VAR} 0 PARENT_SCOPE)
message(STATUS "Could NOT find Python module ${module}")
else()
set(${FOUND_VAR} 1 PARENT_SCOPE)
message(STATUS "Found Python module ${module}")
endif()
endfunction()

set (PYTHON_MODULES
pygments
yaml
)
foreach(module ${PYTHON_MODULES})
find_python_module(${module})
endforeach()

if(PY_PYGMENTS_FOUND AND PY_YAML_FOUND)
set (LLVM_HAVE_OPT_VIEWER_MODULES 1)
else()
set (LLVM_HAVE_OPT_VIEWER_MODULES 0)
endif()
5 changes: 0 additions & 5 deletions test/lit.cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ def get_asan_rtlib():
ocamlopt_command = '%s ocamlopt -cclib -L%s -cclib -Wl,-rpath,%s %s' % (
config.ocamlfind_executable, config.llvm_lib_dir, config.llvm_lib_dir, config.ocaml_flags)

opt_viewer_cmd = '%s %s/tools/opt-viewer/opt-viewer.py' % (sys.executable, config.llvm_src_root)

tools = [
ToolSubst('%lli', FindTool('lli'), post='.', extra_args=lli_args),
Expand All @@ -133,7 +132,6 @@ def get_asan_rtlib():
ToolSubst('%ld64', ld64_cmd, unresolved='ignore'),
ToolSubst('%ocamlc', ocamlc_command, unresolved='ignore'),
ToolSubst('%ocamlopt', ocamlopt_command, unresolved='ignore'),
ToolSubst('%opt-viewer', opt_viewer_cmd),
]

# FIXME: Why do we have both `lli` and `%lli` that do slightly different things?
Expand Down Expand Up @@ -288,6 +286,3 @@ def have_ld64_plugin_support():

if config.llvm_libxml2_enabled == '1':
config.available_features.add('libxml2')

if config.have_opt_viewer_modules:
config.available_features.add('have_opt_viewer_modules')
1 change: 0 additions & 1 deletion test/lit.site.cfg.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ config.link_llvm_dylib = @LLVM_LINK_LLVM_DYLIB@
config.llvm_libxml2_enabled = "@LLVM_LIBXML2_ENABLED@"
config.llvm_host_triple = '@LLVM_HOST_TRIPLE@'
config.host_arch = "@HOST_ARCH@"
config.have_opt_viewer_modules = @LLVM_HAVE_OPT_VIEWER_MODULES@

# Support substitution of the tools_dir with user parameters. This is
# used when we can't determine the tool dir at configuration time.
Expand Down
21 changes: 0 additions & 21 deletions test/tools/opt-viewer/Inputs/basic/or.c

This file was deleted.

16 changes: 0 additions & 16 deletions test/tools/opt-viewer/Inputs/basic/or.h

This file was deleted.

227 changes: 0 additions & 227 deletions test/tools/opt-viewer/Inputs/basic/or.yaml

This file was deleted.

Loading

0 comments on commit 965e787

Please sign in to comment.