From c3236cd200ae19618ab75a7cc6c71472512730e5 Mon Sep 17 00:00:00 2001
From: Artem Dergachev <artem.dergachev@gmail.com>
Date: Mon, 3 Jun 2019 00:21:00 +0000
Subject: [PATCH] Revert "[analyzer] exploded-graph-rewriter: An attempt to fix
 Windows buildbots."

This reverts commit r362343.

Instead, disable tests on Windows for now.

llvm-svn: 362347
---
 clang/test/Analysis/exploded-graph-rewriter/edge.dot           | 3 +++
 clang/test/Analysis/exploded-graph-rewriter/empty.dot          | 3 +++
 clang/test/Analysis/exploded-graph-rewriter/environment.dot    | 3 +++
 clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg      | 4 ++--
 clang/test/Analysis/exploded-graph-rewriter/program_points.dot | 3 +++
 clang/test/Analysis/exploded-graph-rewriter/store.dot          | 3 +++
 6 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/clang/test/Analysis/exploded-graph-rewriter/edge.dot b/clang/test/Analysis/exploded-graph-rewriter/edge.dot
index 5fc695c..fa4b017e 100644
--- a/clang/test/Analysis/exploded-graph-rewriter/edge.dot
+++ b/clang/test/Analysis/exploded-graph-rewriter/edge.dot
@@ -1,5 +1,8 @@
 // RUN: %exploded_graph_rewriter %s | FileCheck %s
 
+// FIXME: Substitution doesn't seem to work on Windows.
+// UNSUPPORTED: system-windows
+
 Node0x1 [shape=record,label=
  "{{ "node_id": 1, "pointer": "0x1",
      "program_state": null, "program_points": []}\l}"];
diff --git a/clang/test/Analysis/exploded-graph-rewriter/empty.dot b/clang/test/Analysis/exploded-graph-rewriter/empty.dot
index 85c227d..3e0733c 100644
--- a/clang/test/Analysis/exploded-graph-rewriter/empty.dot
+++ b/clang/test/Analysis/exploded-graph-rewriter/empty.dot
@@ -1,5 +1,8 @@
 // RUN: %exploded_graph_rewriter %s | FileCheck %s
 
+// FIXME: Substitution doesn't seem to work on Windows.
+// UNSUPPORTED: system-windows
+
 digraph "Exploded Graph" {
   label="Exploded Graph";
 }
diff --git a/clang/test/Analysis/exploded-graph-rewriter/environment.dot b/clang/test/Analysis/exploded-graph-rewriter/environment.dot
index 31d2d72..7271684 100644
--- a/clang/test/Analysis/exploded-graph-rewriter/environment.dot
+++ b/clang/test/Analysis/exploded-graph-rewriter/environment.dot
@@ -1,5 +1,8 @@
 // RUN: %exploded_graph_rewriter %s | FileCheck %s
 
+// FIXME: Substitution doesn't seem to work on Windows.
+// UNSUPPORTED: system-windows
+
 // CHECK: <b>Environment: </b>
 // CHECK-SAME: <table border="0">
 // CHECK-SAME:   <tr>
diff --git a/clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg b/clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg
index 98b9da8..1ebb25a 100644
--- a/clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg
+++ b/clang/test/Analysis/exploded-graph-rewriter/lit.local.cfg
@@ -7,7 +7,7 @@ config.test_format = lit.formats.ShTest(use_lit_shell == "0")
 
 config.substitutions.append(('%exploded_graph_rewriter',
                              lit.util.which('exploded-graph-rewriter.py',
-                                            config.clang_src_dir +
-                                            '/utils/analyzer')))
+                                            os.path.join(config.clang_src_dir,
+                                                         'utils', 'analyzer'))))
 
 config.suffixes = ['.dot']
diff --git a/clang/test/Analysis/exploded-graph-rewriter/program_points.dot b/clang/test/Analysis/exploded-graph-rewriter/program_points.dot
index a7696d2..aadabf3 100644
--- a/clang/test/Analysis/exploded-graph-rewriter/program_points.dot
+++ b/clang/test/Analysis/exploded-graph-rewriter/program_points.dot
@@ -1,5 +1,8 @@
 // RUN: %exploded_graph_rewriter %s | FileCheck %s
 
+// FIXME: Substitution doesn't seem to work on Windows.
+// UNSUPPORTED: system-windows
+
 // CHECK: <b>Program point:</b>
 // CHECK-SAME: <table border="0" align="left" width="0">
 // CHECK-SAME:   <tr>
diff --git a/clang/test/Analysis/exploded-graph-rewriter/store.dot b/clang/test/Analysis/exploded-graph-rewriter/store.dot
index 0f0fa92..8152a99 100644
--- a/clang/test/Analysis/exploded-graph-rewriter/store.dot
+++ b/clang/test/Analysis/exploded-graph-rewriter/store.dot
@@ -1,5 +1,8 @@
 // RUN: %exploded_graph_rewriter %s | FileCheck %s
 
+// FIXME: Substitution doesn't seem to work on Windows.
+// UNSUPPORTED: system-windows
+
 // CHECK: <b>Store: </b>
 // CHECK-SAME: <table border="0">
 // CHECK-SAME:   <tr>
-- 
2.7.4