diff options
| -rw-r--r-- | docs/TestingGuide.html | 27 | ||||
| -rw-r--r-- | test/Makefile | 12 | ||||
| -rw-r--r-- | test/Unit/lit.site.cfg.in | 1 | ||||
| -rw-r--r-- | test/lib/llvm.exp | 22 | ||||
| -rw-r--r-- | test/lit.cfg | 29 | ||||
| -rw-r--r-- | test/lit.site.cfg.in | 1 | ||||
| -rw-r--r-- | test/site.exp.in | 12 |
7 files changed, 5 insertions, 99 deletions
diff --git a/docs/TestingGuide.html b/docs/TestingGuide.html index b4fa672976..0f73d6d5be 100644 --- a/docs/TestingGuide.html +++ b/docs/TestingGuide.html @@ -798,37 +798,10 @@ define two separate CHECK lines that match on the same line. you need multiple temporaries. This is useful as the destination of some redirected output.</dd> - <dt><b>llvmlibsdir</b> (%llvmlibsdir)</dt> - <dd>The directory where the LLVM libraries are located.</dd> - <dt><b>target_triplet</b> (%target_triplet)</dt> <dd>The target triplet that corresponds to the current host machine (the one running the test cases). This should probably be called "host".<dd> - <dt><b>llvmgcc</b> (%llvmgcc)</dt> - <dd>The full path to the <tt>llvm-gcc</tt> executable as specified in the - configured LLVM environment</dd> - - <dt><b>llvmgxx</b> (%llvmgxx)</dt> - <dd>The full path to the <tt>llvm-gxx</tt> executable as specified in the - configured LLVM environment</dd> - - <dt><b>gccpath</b></dt> - <dd>The full path to the C compiler used to <i>build </i> LLVM. Note that - this might not be gcc.</dd> - - <dt><b>gxxpath</b></dt> - <dd>The full path to the C++ compiler used to <i>build </i> LLVM. Note that - this might not be g++.</dd> - - <dt><b>compile_c</b> (%compile_c)</dt> - <dd>The full command line used to compile LLVM C source code. This has all - the configured -I, -D and optimization options.</dd> - - <dt><b>compile_cxx</b> (%compile_cxx)</dt> - <dd>The full command used to compile LLVM C++ source code. This has - all the configured -I, -D and optimization options.</dd> - <dt><b>link</b> (%link)</dt> <dd>This full link command used to link LLVM executables. This has all the configured -I, -L and -l options.</dd> diff --git a/test/Makefile b/test/Makefile index b1550df48a..62b097354b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -140,30 +140,18 @@ site.exp: FORCE @echo '# Do not edit!' >> site.tmp @echo 'set target_triplet "$(TARGET_TRIPLE)"' >> site.tmp @echo 'set TARGETS_TO_BUILD "$(TARGETS_TO_BUILD)"' >> site.tmp - @echo 'set llvmgcc_langs "$(LLVMGCC_LANGS)"' >> site.tmp - @echo 'set llvmtoolsdir "$(ToolDir)"' >>site.tmp - @echo 'set llvmlibsdir "$(LibDir)"' >>site.tmp @echo 'set llvmshlibdir "$(SharedLibDir)"' >>site.tmp @echo 'set llvm_bindings "$(BINDINGS_TO_BUILD)"' >> site.tmp @echo 'set srcroot "$(LLVM_SRC_ROOT)"' >>site.tmp @echo 'set objroot "$(LLVM_OBJ_ROOT)"' >>site.tmp @echo 'set srcdir "$(LLVM_SRC_ROOT)/test"' >>site.tmp @echo 'set objdir "$(LLVM_OBJ_ROOT)/test"' >>site.tmp - @echo 'set gccpath "$(CC)"' >>site.tmp - @echo 'set gxxpath "$(CXX)"' >>site.tmp - @echo 'set compile_c "' $(CC) $(CPP.Flags) $(TargetCommonOpts) $(CompileCommonOpts) -c '"' >>site.tmp - @echo 'set compile_cxx "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) $(CompileCommonOpts) -c -x c++ '"' >> site.tmp @echo 'set link "' $(CXX) $(CPP.Flags) $(CXX.Flags) $(TargetCommonOpts) $(CompileCommonOpts) $(LD.Flags) '"' >>site.tmp - @echo 'set llvmgcc "$(LLVMGCC) $(TargetCommonOpts) $(EXTRA_OPTIONS)"' >> site.tmp - @echo 'set llvmgxx "$(LLVMGCC) $(TargetCommonOpts) $(EXTRA_OPTIONS)"' >> site.tmp - @echo 'set bugpoint_topts $(BUGPOINT_TOPTS)' >> site.tmp @echo 'set shlibext "$(SHLIBEXT)"' >> site.tmp @echo 'set ocamlopt "$(OCAMLOPT) -cc \"$(CXX_FOR_OCAMLOPT)\" -I $(LibDir)/ocaml"' >> site.tmp @echo 'set valgrind "$(VALGRIND)"' >> site.tmp @echo 'set grep "$(GREP)"' >>site.tmp @echo 'set gas "$(GAS)"' >>site.tmp - @echo 'set llvmdsymutil "$(DSYMUTIL)"' >>site.tmp - @echo 'set emitir "$(LLVMCC_EMITIR_FLAG)"' >>site.tmp @echo '## All variables above are generated by configure. Do Not Edit ## ' >>site.tmp @test ! -f site.exp || \ sed '1,/^## All variables above are.*##/ d' site.exp >> site.tmp diff --git a/test/Unit/lit.site.cfg.in b/test/Unit/lit.site.cfg.in index 9643507b16..65e98d0af5 100644 --- a/test/Unit/lit.site.cfg.in +++ b/test/Unit/lit.site.cfg.in @@ -3,7 +3,6 @@ config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" -config.llvmgcc_dir = "@LLVMGCCDIR@" config.llvm_build_mode = "@LLVM_BUILD_MODE@" config.enable_shared = @ENABLE_SHARED@ config.shlibdir = "@SHLIBDIR@" diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp index 89be85cda8..a61f934df7 100644 --- a/test/lib/llvm.exp +++ b/test/lib/llvm.exp @@ -47,9 +47,9 @@ proc execOneLine { test PRS outcome lineno line } { # cases. proc substitute { line test tmpFile } { global srcroot objroot srcdir objdir subdir target_triplet - global llvmgcc llvmgxx emitir ocamlopt - global gccpath gxxpath compile_c compile_cxx link shlibext llvmlibsdir - global llvmdsymutil valgrind grep gas bugpoint_topts + global ocamlopt + global link shlibext + global valgrind grep gas set path [file join $srcdir $subdir] # Substitute all Tcl variables. @@ -57,28 +57,12 @@ proc substitute { line test tmpFile } { #replace %% with _#MARKER#_ to make the replacement of %% more predictable regsub -all {%%} $new_line {_#MARKER#_} new_line - #replace %llvmgcc_only with actual path to llvmgcc - regsub -all {%llvmgcc_only} $new_line "$llvmgcc" new_line - #replace %llvmgcc with actual path to llvmgcc - regsub -all {%llvmgcc} $new_line "$llvmgcc $emitir -w" new_line - #replace %llvmgxx with actual path to llvmg++ - regsub -all {%llvmgxx} $new_line "$llvmgxx $emitir -w" new_line - #replace %compile_cxx with C++ compilation command - regsub -all {%compile_cxx} $new_line "$compile_cxx" new_line - #replace %compile_c with C compilation command - regsub -all {%compile_c} $new_line "$compile_c" new_line #replace %link with C++ link command regsub -all {%link} $new_line "$link" new_line #replace %shlibext with shared library extension regsub -all {%shlibext} $new_line "$shlibext" new_line #replace %ocamlopt with ocaml compiler command regsub -all {%ocamlopt} $new_line "$ocamlopt" new_line - #replace %llvmdsymutil with dsymutil command - regsub -all {%llvmdsymutil} $new_line "$llvmdsymutil" new_line - #replace %llvmlibsdir with configure library directory - regsub -all {%llvmlibsdir} $new_line "$llvmlibsdir" new_line - #replace %bugpoint_topts with actual bugpoint target options - regsub -all {%bugpoint_topts} $new_line "$bugpoint_topts" new_line #replace %p with path to source, regsub -all {%p} $new_line [file join $srcdir $subdir] new_line #replace %s with filename diff --git a/test/lit.cfg b/test/lit.cfg index 91abb636f4..cf654f0059 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -42,18 +42,6 @@ if llvm_obj_root is not None: # Tweak the PATH to include the scripts dir, the tools dir, and the llvm-gcc bin # dir (if available). if llvm_obj_root is not None: - # Include llvm-gcc first, as the llvm-gcc binaryies will not appear - # neither in the tools nor in the scripts dir. However it might be - # possible, that some old llvm tools are in the llvm-gcc dir. Adding - # llvm-gcc dir first ensures, that those will always be overwritten - # by the new tools in llvm_tools_dir. So now outdated tools are used - # for testing - llvmgcc_dir = getattr(config, 'llvmgcc_dir', None) - if llvmgcc_dir: - path = os.path.pathsep.join((os.path.join(llvmgcc_dir, 'bin'), - config.environment['PATH'])) - config.environment['PATH'] = path - llvm_src_root = getattr(config, 'llvm_src_root', None) if not llvm_src_root: lit.fatal('No LLVM source root set!') @@ -154,21 +142,8 @@ for line in open(os.path.join(config.llvm_obj_root, 'test', 'site.exp')): site_exp[m.group(1)] = m.group(2) # Add substitutions. -config.substitutions.append(('%llvmgcc_only', site_exp['llvmgcc'])) -for sub in ['llvmgcc', 'llvmgxx', 'emitir', 'compile_cxx', 'compile_c', - 'link', 'shlibext', 'ocamlopt', 'llvmdsymutil', 'llvmlibsdir', - 'llvmshlibdir', - 'bugpoint_topts']: - if sub in ('llvmgcc', 'llvmgxx'): - config.substitutions.append(('%' + sub, - site_exp[sub] + ' %emitir -w')) - # FIXME: This is a hack to avoid LLVMC tests failing due to a clang driver - # warning when passing in "-fexceptions -fno-exceptions". - elif sub == 'compile_cxx': - config.substitutions.append(('%' + sub, - site_exp[sub].replace('-fno-exceptions', ''))) - else: - config.substitutions.append(('%' + sub, site_exp[sub])) +for sub in ['link', 'shlibext', 'ocamlopt', 'llvmshlibdir']: + config.substitutions.append(('%' + sub, site_exp[sub])) # For each occurrence of an llvm tool name as its own word, replace it # with the full path to the build directory holding that tool. This diff --git a/test/lit.site.cfg.in b/test/lit.site.cfg.in index fe152ef499..5a42e5c33c 100644 --- a/test/lit.site.cfg.in +++ b/test/lit.site.cfg.in @@ -3,7 +3,6 @@ config.llvm_src_root = "@LLVM_SOURCE_DIR@" config.llvm_obj_root = "@LLVM_BINARY_DIR@" config.llvm_tools_dir = "@LLVM_TOOLS_DIR@" -config.llvmgcc_dir = "@LLVMGCCDIR@" config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@" config.python_executable = "@PYTHON_EXECUTABLE@" config.enable_shared = @ENABLE_SHARED@ diff --git a/test/site.exp.in b/test/site.exp.in index 277d54995f..cfb2eac550 100644 --- a/test/site.exp.in +++ b/test/site.exp.in @@ -2,27 +2,15 @@ # Do not edit! set target_triplet "@TARGET_TRIPLE@" set TARGETS_TO_BUILD "@TARGETS_TO_BUILD@" -set llvmgcc_langs "@LLVMGCC_LANGS@" -set llvmtoolsdir "@LLVM_TOOLS_DIR@" -set llvmlibsdir "@LLVM_LIBS_DIR@" set llvmshlibdir "@SHLIBDIR@" set llvm_bindings "@LLVM_BINDINGS@" set srcroot "@LLVM_SOURCE_DIR@" set objroot "@LLVM_BINARY_DIR@" set srcdir "@LLVM_SOURCE_DIR@" set objdir "@LLVM_BINARY_DIR@" -set gccpath "@GCCPATH@" -set gxxpath "@GXXPATH@" -set compile_c "@TEST_COMPILE_C_CMD@" -set compile_cxx "@TEST_COMPILE_CXX_CMD@" set link "@TEST_LINK_CMD@" -set llvmgcc "@LLVMGCC@" -set llvmgxx "@LLVMGXX@" -set bugpoint_topts "@BUGPOINT_TOPTS@" set shlibext "@SHLIBEXT@" set ocamlopt "@OCAMLOPT@" set valgrind "@VALGRIND@" set grep "@GREP@" set gas "@AS@" -set llvmdsymutil "@DSYMUTIL@" -set emitir "@LLVMCC_EMITIR_FLAG@" |