From 557aebcdfaea2e653c64eb749ee6eb2acfa2ec34 Mon Sep 17 00:00:00 2001
From: Adrian Prantl <aprantl@apple.com>
Date: Wed, 23 Sep 2015 19:53:10 +0000
Subject: [PATCH] Fix this dsymutil testcase by not passing in a path to the
 modulemap file, so the lookup works as expected after prepending the
 oso-prepend-path.

This manifested only on Windows, because "/" is not a relative path there.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@248423 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/tools/dsymutil/Inputs/mismatch/1.o | Bin 1980 -> 1972 bytes
 test/tools/dsymutil/X86/mismatch.m      |   4 +---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/tools/dsymutil/Inputs/mismatch/1.o b/test/tools/dsymutil/Inputs/mismatch/1.o
index 45d176c96be1a3672b7719d71062edc5bb66b028..2a855ae293dc148bcaa94c64bd13b5dc6f720ee0 100644
GIT binary patch
delta 333
zcmdnPzlDE-gWv=v1~B-*0-+~N47|@6H`$QUT`(OY0w=>KcQV?;MPs4j;gfGN+DjgR
z^6H`V7FGzOVX`5Uxu7#6R2WJbPp)LLhl|?4MNa}n>!E5@prZMcC7JC77o&+zo}393
zJq{JsfvVj;c_*{I<PWH*0aWw_8v_F~kUe3tAd9)A2GqkDP+19f2xG?NL>7I{1wbB1
v`-aIgSynOXO%7z;#~3qNfK7$-+48N{AeBCoZQ1mJV!3S15I;`-z;*@zmdr5#

delta 340
zcmdnOzlVQ<gWwD%1~B-*0-<M247|^nJ=u`aU9bcq0w+@@cQV?;MPs4jDU)w9+Dl%9
z^6H`VK~@N(W3nNWxnKYzR2WJ*Os-_Ihl|?4MNa}nd!TAnprSRCC7JC7H=v0wn4Ad|
zy#f{0fvP<+c_*{IBm>k-22jxtYzz#{K=zEuf-L5e22j}ysH_4zgt1_9B8xuf3Lp<;
z=#I%VSyu6R<`tBd6zk{ar<CTT7Eg9z-N%?YnVC(6)3)GyH%MFLWCJ#RpjZN1^W+z7
FX8^xmHdp`v

diff --git a/test/tools/dsymutil/X86/mismatch.m b/test/tools/dsymutil/X86/mismatch.m
index ddb4b68b943..33ae782df05 100644
--- a/test/tools/dsymutil/X86/mismatch.m
+++ b/test/tools/dsymutil/X86/mismatch.m
@@ -15,9 +15,7 @@
 */
 
 // RUN: llvm-dsymutil -f -oso-prepend-path=%p/../Inputs/mismatch \
-// RUN:   -y %p/dummy-debug-map.map -o %t.bin  >%t 2>&1
-// RUN: cat %t
-// RUN: cat %t | FileCheck %s
+// RUN:   -y %p/dummy-debug-map.map -o %t.bin 2>&1 | FileCheck %s
 
 @import mismatch;
 
-- 
2.34.1