Fix some tests

Author: hlopko

test/Interop/Cxx/templates/demangling.swift

@@ -1,4 +1,4 @@
-// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | grep 'define.*swiftcc.*$' | grep -o '\$[[:alnum:]]\+__CxxTemplateInst[[:alnum:]]\+' | xargs %swift-demangle | %FileCheck %s
+// RUN: %target-swift-emit-ir %s -I %S/Inputs -enable-cxx-interop | grep 'define.*swiftcc.*$' | grep -o '[[:alnum:]]*__CxxTemplateInst[[:alnum:]]*' | xargs %swift-demangle | %FileCheck %s
 
 import Mangling
 

test/lit.cfg

@@ -282,7 +282,6 @@ config.sourcekitd_test = inferSwiftBinary('sourcekitd-test')
 config.complete_test = inferSwiftBinary('complete-test')
 config.swift_api_digester = inferSwiftBinary('swift-api-digester')
 config.swift_refactor = inferSwiftBinary('swift-refactor')
-config.swift_demangle = inferSwiftBinary('swift-demangle')
 config.swift_demangle_yamldump = inferSwiftBinary('swift-demangle-yamldump')
 config.swift_demangle = inferSwiftBinary('swift-demangle')
 config.benchmark_o = inferSwiftBinary('Benchmark_O')
@@ -437,7 +436,6 @@ config.substitutions.append( ('%llvm-dwarfdump', config.llvm_dwarfdump) )
 config.substitutions.append( ('%llvm-readelf', config.llvm_readelf) )
 config.substitutions.append( ('%llvm-dis', config.llvm_dis) )
 config.substitutions.append( ('%llvm-nm', config.llvm_nm) )
-config.substitutions.append( ('%swift-demangle', config.swift_demangle) )
 config.substitutions.append( ('%swift-demangle-yamldump', config.swift_demangle_yamldump) )
 config.substitutions.append( ('%swift-demangle', config.swift_demangle) )
 config.substitutions.append( ('%Benchmark_O', config.benchmark_o) )