From e3447e67fe41bfb56ab24fb2758966d34ed5cd89 Mon Sep 17 00:00:00 2001
From: LemonBoy <thatlemon@gmail.com>
Date: Fri, 7 Feb 2020 17:21:28 +0100
Subject: [PATCH] riscv64: Enable some more tests

Closes #3338
---
 test/stage1/behavior/atomics.zig  |  4 +++-
 test/stage1/behavior/cast.zig     |  4 ----
 test/stage1/behavior/math.zig     | 12 ------------
 test/stage1/behavior/widening.zig |  8 --------
 4 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/test/stage1/behavior/atomics.zig b/test/stage1/behavior/atomics.zig
index 7155e80094..1ae59ca2d7 100644
--- a/test/stage1/behavior/atomics.zig
+++ b/test/stage1/behavior/atomics.zig
@@ -146,7 +146,9 @@ fn testAtomicStore() void {
 }
 
 test "atomicrmw with floats" {
-    if (builtin.arch == .aarch64 or builtin.arch == .arm)
+    if (builtin.arch == .aarch64 or
+        builtin.arch == .arm or
+        builtin.arch == .riscv64)
         return;
     testAtomicRmwFloat();
 }
diff --git a/test/stage1/behavior/cast.zig b/test/stage1/behavior/cast.zig
index fe55b445a8..b928ffc356 100644
--- a/test/stage1/behavior/cast.zig
+++ b/test/stage1/behavior/cast.zig
@@ -261,10 +261,6 @@ fn testPeerErrorAndArray2(x: u8) anyerror![]const u8 {
 }
 
 test "@floatToInt" {
-    if (@import("builtin").arch == .riscv64) {
-        // TODO: https://github.com/ziglang/zig/issues/3338
-        return error.SkipZigTest;
-    }
     testFloatToInts();
     comptime testFloatToInts();
 }
diff --git a/test/stage1/behavior/math.zig b/test/stage1/behavior/math.zig
index 6d0c2847a9..0515e32d33 100644
--- a/test/stage1/behavior/math.zig
+++ b/test/stage1/behavior/math.zig
@@ -7,10 +7,6 @@ const minInt = std.math.minInt;
 const mem = std.mem;
 
 test "division" {
-    if (@import("builtin").arch == .riscv64) {
-        // TODO: https://github.com/ziglang/zig/issues/3338
-        return error.SkipZigTest;
-    }
     testDivision();
     comptime testDivision();
 }
@@ -578,10 +574,6 @@ fn remdiv(comptime T: type) void {
 }
 
 test "@sqrt" {
-    if (@import("builtin").arch == .riscv64) {
-        // TODO: https://github.com/ziglang/zig/issues/3338
-        return error.SkipZigTest;
-    }
     testSqrt(f64, 12.0);
     comptime testSqrt(f64, 12.0);
     testSqrt(f32, 13.0);
@@ -627,10 +619,6 @@ test "vector integer addition" {
 }
 
 test "NaN comparison" {
-    if (@import("builtin").arch == .riscv64) {
-        // TODO: https://github.com/ziglang/zig/issues/3338
-        return error.SkipZigTest;
-    }
     if (std.Target.current.isWindows()) {
         // TODO https://github.com/ziglang/zig/issues/508
         return error.SkipZigTest;
diff --git a/test/stage1/behavior/widening.zig b/test/stage1/behavior/widening.zig
index 1aa7ff5d22..71f8ae482e 100644
--- a/test/stage1/behavior/widening.zig
+++ b/test/stage1/behavior/widening.zig
@@ -19,10 +19,6 @@ test "implicit unsigned integer to signed integer" {
 }
 
 test "float widening" {
-    if (@import("builtin").arch == .riscv64) {
-        // TODO:
-        return error.SkipZigTest;
-    }
     var a: f16 = 12.34;
     var b: f32 = a;
     var c: f64 = b;
@@ -35,10 +31,6 @@ test "float widening" {
 test "float widening f16 to f128" {
     // TODO https://github.com/ziglang/zig/issues/3282
     if (@import("builtin").arch == .aarch64) return error.SkipZigTest;
-    if (@import("builtin").arch == .riscv64) {
-        // TODO: https://github.com/ziglang/zig/issues/3338
-        return error.SkipZigTest;
-    }
 
     var x: f16 = 12.34;
     var y: f128 = x;