4 files changed, 14 insertions, 8 deletions
diff --git a/llvm/test/Object/X86/dg.exp b/llvm/test/Object/X86/dg.exp
deleted file mode 100644
index 6a91de70cae..00000000000
--- a/llvm/test/Object/X86/dg.exp
+++ /dev/null
@@ -1,5 +0,0 @@
-load_lib llvm.exp
-
-if { [llvm_supports_target X86] } {
-  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{test}]]
-}
diff --git a/llvm/test/Object/X86/lit.local.cfg b/llvm/test/Object/X86/lit.local.cfg
new file mode 100644
index 00000000000..bbffb847bdf
--- /dev/null
+++ b/llvm/test/Object/X86/lit.local.cfg
@@ -0,0 +1,13 @@
+config.suffixes = ['.test']
+
+def getRoot(config):
+    if not config.parent:
+        return config
+    return getRoot(config.parent)
+
+root = getRoot(config)
+
+targets = set(root.targets_to_build.split())
+if not 'X86' in targets:
+    config.unsupported = True
+
diff --git a/llvm/test/Object/dg.exp b/llvm/test/Object/dg.exp
deleted file mode 100644
index be82c513920..00000000000
--- a/llvm/test/Object/dg.exp
+++ /dev/null
@@ -1,3 +0,0 @@
-load_lib llvm.exp
-
-RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{test}]]
diff --git a/llvm/test/Object/lit.local.cfg b/llvm/test/Object/lit.local.cfg
new file mode 100644
index 00000000000..df9b335dd13
--- /dev/null
+++ b/llvm/test/Object/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.test']