Update lld test suite to include a substitution for the current LLVM version and make the test parametric

[mehdi_amini]

Summary

This makes the test introduced in 537f5483fe4e more robust with respect
to the actual version number. The previous regex restricted the version
to start with a leading 1 which was overly restrictive.

[int3]

lld/test/lit.cfg.py

86

@ruiu has pushed back against using substitutions previously (in D77086). Could we just make the regex more flexible?

[mehdi_amini]

lld/test/lit.cfg.py

86

I already made the regex less strict, if we can leave it as-is that works for us.

[MaskRay]

I'd suggest overridding the version field with getenv("LLD_VERSION"). See ELF/SyntheticSections.cpp:getVersion.

A mechanism allowing easy cross-version comparison is useful.

lld/test/lit.cfg.py

86

If we override the behavior with an environment variable, the lit substitution can be removed.

lld/test/MachO/lc-build-version.s

 # REQUIRES: x86
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-darwin %s -o %t.o
 # RUN: lld -flavor darwinnew -Z -platform_version macos 10.14.1 10.15 -o %t %t.o
-# RUN: llvm-objdump --macho --all-headers %t | FileCheck %s
+# RUN: llvm-objdump --macho --all-headers %t | FileCheck %s -DLLD_VERSION=%llvm_version
 
 # CHECK: cmd LC_BUILD_VERSION
 # CHECK-NEXT: cmdsize 32
 # CHECK-NEXT: platform macos
 # CHECK-NEXT: sdk 10.15
 # CHECK-NEXT: minos 10.14.1
 # CHECK-NEXT: ntools 1
 # CHECK-NEXT: tool ld
-# CHECK-NEXT: version {{[0-9\.]+}}
+# CHECK-NEXT: version [[LLD_VERSION]]
 # CHECK-NEXT: Load command [[#]]
 
 .text
 .global _main
 _main:
   mov $0, %eax
   ret

lld/test/lit.cfg.py

('--targets-built', {'AArch64': 'aarch64',
                           'Sparc': 'sparc',
                           'WebAssembly': 'wasm',
                           'X86': 'x86'})
      ])
 
 # Set a fake constant version so that we get consistent output.
 config.environment['LLD_VERSION'] = 'LLD 1.0'
 config.environment['LLD_IN_TEST'] = '1'
+config.substitutions.append(("%llvm_version", config.llvm_version))
 
 # Indirectly check if the mt.exe Microsoft utility exists by searching for
 # cvtres, which always accompanies it.  Alternatively, check if we can use
 # libxml2 to merge manifests.
 if (lit.util.which('cvtres', config.environment['PATH']) or 
         config.llvm_libxml2_enabled):
     config.available_features.add('manifest_tool')
 

lld/test/lit.site.cfg.py.in

 config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"
 config.lld_obj_root = "@LLD_BINARY_DIR@"
 config.lld_libs_dir = "@LLVM_LIBRARY_OUTPUT_INTDIR@"
 config.lld_tools_dir = "@LLVM_RUNTIME_OUTPUT_INTDIR@"
 config.target_triple = "@TARGET_TRIPLE@"
 config.python_executable = "@Python3_EXECUTABLE@"
 config.have_zlib = @LLVM_ENABLE_ZLIB@
 config.sizeof_void_p = @CMAKE_SIZEOF_VOID_P@
+config.llvm_version = "@LLVM_VERSION_MAJOR@.@LLVM_VERSION_MINOR@"
 
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.
 try:
     config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
     config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
 except KeyError as e:
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))
 
 import lit.llvm
 lit.llvm.initialize(lit_config, config)
 
 # Let the main config do the real work.
 lit_config.load_config(config, "@LLD_SOURCE_DIR@/test/lit.cfg.py")