Skip to content

Revert "[StdLib] Extend ReflectionHashing test to pass on Linux" #933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 10, 2016
Merged

Revert "[StdLib] Extend ReflectionHashing test to pass on Linux" #933

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 4 additions & 20 deletions test/1_stdlib/ReflectionHashing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// RUN: %target-run %t.out
// REQUIRES: executable_test

// XFAIL: linux

//
// This file contains reflection tests that depend on hash values.
// Don't add other tests here.
Expand Down Expand Up @@ -36,7 +38,7 @@ Reflection.test("Dictionary") {
var output = ""
dump(dict, &output)

#if _runtime(_ObjC) && (arch(i386) || arch(arm))
#if arch(i386) || arch(arm)
var expected = ""
expected += "▿ 5 key/value pairs\n"
expected += " ▿ [0]: (2 elements)\n"
Expand All @@ -54,7 +56,7 @@ Reflection.test("Dictionary") {
expected += " ▿ [4]: (2 elements)\n"
expected += " - .0: Three\n"
expected += " - .1: 3\n"
#elseif _runtime(_ObjC) && (arch(x86_64) || arch(arm64))
#elseif arch(x86_64) || arch(arm64)
var expected = ""
expected += "▿ 5 key/value pairs\n"
expected += " ▿ [0]: (2 elements)\n"
Expand All @@ -72,24 +74,6 @@ Reflection.test("Dictionary") {
expected += " ▿ [4]: (2 elements)\n"
expected += " - .0: Four\n"
expected += " - .1: 4\n"
#elseif !_runtime(_ObjC) && arch(x86_64)
var expected = ""
expected += "▿ 5 key/value pairs\n"
expected += " ▿ [0]: (2 elements)\n"
expected += " - .0: One\n"
expected += " - .1: 1\n"
expected += " ▿ [1]: (2 elements)\n"
expected += " - .0: Five\n"
expected += " - .1: 5\n"
expected += " ▿ [2]: (2 elements)\n"
expected += " - .0: Two\n"
expected += " - .1: 2\n"
expected += " ▿ [3]: (2 elements)\n"
expected += " - .0: Four\n"
expected += " - .1: 4\n"
expected += " ▿ [4]: (2 elements)\n"
expected += " - .0: Three\n"
expected += " - .1: 3\n"
#else
fatalError("unimplemented")
#endif
Expand Down