From e5fd8efcb60cd0223a7dd5e5825d3b9efc006c2a Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Tue, 27 Sep 2016 00:09:43 -0400
Subject: [PATCH] clean up test directory

---
 .../namespace_depends_on_compile_var}/a.zig   |  0
 .../namespace_depends_on_compile_var}/b.zig   |  0
 .../index.zig                                 | 16 ++++++++++
 test/cases/pub_enum/index.zig                 | 17 +++++++++++
 test/{ => cases/pub_enum}/other.zig           |  0
 test/self_hosted.zig                          | 30 -------------------
 6 files changed, 33 insertions(+), 30 deletions(-)
 rename test/{ => cases/namespace_depends_on_compile_var}/a.zig (100%)
 rename test/{ => cases/namespace_depends_on_compile_var}/b.zig (100%)
 create mode 100644 test/cases/namespace_depends_on_compile_var/index.zig
 create mode 100644 test/cases/pub_enum/index.zig
 rename test/{ => cases/pub_enum}/other.zig (100%)

diff --git a/test/a.zig b/test/cases/namespace_depends_on_compile_var/a.zig
similarity index 100%
rename from test/a.zig
rename to test/cases/namespace_depends_on_compile_var/a.zig
diff --git a/test/b.zig b/test/cases/namespace_depends_on_compile_var/b.zig
similarity index 100%
rename from test/b.zig
rename to test/cases/namespace_depends_on_compile_var/b.zig
diff --git a/test/cases/namespace_depends_on_compile_var/index.zig b/test/cases/namespace_depends_on_compile_var/index.zig
new file mode 100644
index 0000000000..d6c7313e88
--- /dev/null
+++ b/test/cases/namespace_depends_on_compile_var/index.zig
@@ -0,0 +1,16 @@
+const assert = @import("std").debug.assert;
+
+#attribute("test")
+fn namespaceDependsOnCompileVar() {
+    if (some_namespace.a_bool) {
+        assert(some_namespace.a_bool);
+    } else {
+        assert(!some_namespace.a_bool);
+    }
+}
+const some_namespace = switch(@compileVar("os")) {
+    linux => @import("a.zig"),
+    else => @import("b.zig"),
+};
+
+
diff --git a/test/cases/pub_enum/index.zig b/test/cases/pub_enum/index.zig
new file mode 100644
index 0000000000..7767c94002
--- /dev/null
+++ b/test/cases/pub_enum/index.zig
@@ -0,0 +1,17 @@
+const assert = @import("std").debug.assert;
+const other = @import("other.zig");
+
+#attribute("test")
+fn pubEnum() {
+    pubEnumTest(other.APubEnum.Two);
+}
+fn pubEnumTest(foo: other.APubEnum) {
+    assert(foo == other.APubEnum.Two);
+}
+
+#attribute("test")
+fn castWithImportedSymbol() {
+    assert(other.size_t(42) == 42);
+}
+
+
diff --git a/test/other.zig b/test/cases/pub_enum/other.zig
similarity index 100%
rename from test/other.zig
rename to test/cases/pub_enum/other.zig
diff --git a/test/self_hosted.zig b/test/self_hosted.zig
index 80fe018461..777de7f29e 100644
--- a/test/self_hosted.zig
+++ b/test/self_hosted.zig
@@ -2,7 +2,6 @@ const std = @import("std");
 const assert = std.debug.assert;
 const str = std.str;
 const cstr = std.cstr;
-const other = @import("other.zig");
 // TODO '_' identifier for unused variable bindings
 const test_return_type_type = @import("cases/return_type_type.zig");
 const test_zeroes = @import("cases/zeroes.zig");
@@ -1242,21 +1241,6 @@ fn test3_2(f: Test3Foo) {
 
 
 
-#attribute("test")
-fn pubEnum() {
-    pubEnumTest(other.APubEnum.Two);
-}
-fn pubEnumTest(foo: other.APubEnum) {
-    assert(foo == other.APubEnum.Two);
-}
-
-
-#attribute("test")
-fn castWithImportedSymbol() {
-    assert(other.size_t(42) == 42);
-}
-
-
 #attribute("test")
 fn whileWithContinueExpr() {
     var sum: i32 = 0;
@@ -1637,20 +1621,6 @@ fn aGenericFn(inline T: type, inline a: T, b: T) -> T {
 }
 
 
-#attribute("test")
-fn namespaceDependsOnCompileVar() {
-    if (some_namespace.a_bool) {
-        assert(some_namespace.a_bool);
-    } else {
-        assert(!some_namespace.a_bool);
-    }
-}
-const some_namespace = switch(@compileVar("os")) {
-    linux => @import("a.zig"),
-    else => @import("b.zig"),
-};
-
-
 #attribute("test")
 fn unsigned64BitDivision() {
     const result = div(1152921504606846976, 34359738365);