From 39edf8bbe820ce38128d335a6b44abc755a077ac Mon Sep 17 00:00:00 2001
From: Gary Talent <gtalent2@gmail.com>
Date: Thu, 6 Apr 2017 16:21:37 -0500
Subject: [PATCH] Make each test in memcmp tests distinct in CMakeLists.txt

---
 src/ox/std/test/CMakeLists.txt |  5 ++++-
 src/ox/std/test/tests.cpp      | 34 ++++++++++++++++++++++++----------
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/ox/std/test/CMakeLists.txt b/src/ox/std/test/CMakeLists.txt
index 31ef13785..c59bf7bca 100644
--- a/src/ox/std/test/CMakeLists.txt
+++ b/src/ox/std/test/CMakeLists.txt
@@ -7,4 +7,7 @@ add_executable(
 
 target_link_libraries(StdTest OxStd)
 
-add_test("Test\\ ox_memcmp" StdTest "ox_memcmp")
+add_test("Test\\ ox_memcmp\\ ABCDEFG\\ !=\\ HIJKLMN" StdTest "ABCDEFG != HIJKLMN")
+add_test("Test\\ ox_memcmp\\ HIJKLMN\\ !=\\ ABCDEFG" StdTest "HIJKLMN != ABCDEFG")
+add_test("Test\\ ox_memcmp\\ ABCDEFG\\ ==\\ ABCDEFG" StdTest "ABCDEFG == ABCDEFG")
+add_test("Test\\ ox_memcmp\\ ABCDEFGHI\\ ==\\ ABCDEFG" StdTest "ABCDEFGHI == ABCDEFG")
diff --git a/src/ox/std/test/tests.cpp b/src/ox/std/test/tests.cpp
index 131560b34..a8c779cc2 100644
--- a/src/ox/std/test/tests.cpp
+++ b/src/ox/std/test/tests.cpp
@@ -10,19 +10,33 @@
 #include <functional>
 #include <ox/std/std.hpp>
 
-::std::map<std::string, std::function<int()>> tests = {
+using namespace std;
+
+map<string, function<int()>> tests = {
 	{
-		"ox_memcmp",
+		"ABCDEFG != HIJKLMN",
 		[]() {
-			int success = 1;
-			const char *data1 = "ABCDEFG";
-			const char *data2 = "HIJKLMN";
-			success &= ox_memcmp(data1, data2, 7) < 0;
-			success &= ox_memcmp(data2, data1, 7) > 0;
-			success &= ox_memcmp(data1, data1, 7) == 0;
-			return !success;
+			return !ox_memcmp("ABCDEFG", "HIJKLMN", 7) < 0;
 		}
-	}
+	},
+	{
+		"HIJKLMN != ABCDEFG",
+		[]() {
+			return !ox_memcmp("HIJKLMN", "ABCDEFG", 7) > 0;
+		}
+	},
+	{
+		"ABCDEFG == ABCDEFG",
+		[]() {
+			return !ox_memcmp("ABCDEFG", "ABCDEFG", 7) == 0;
+		}
+	},
+	{
+		"ABCDEFGHI == ABCDEFG",
+		[]() {
+			return !ox_memcmp("ABCDEFGHI", "ABCDEFG", 7) == 0;
+		}
+	},
 };
 
 int main(int argc, const char **args) {