[arrayfire] 206/284: Re-enable disabled sort tests from issue #995

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/experimental
in repository arrayfire.

commit db14451e7e2ac0784fc7ac475b65feb8697bf48a
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Sun Jan 10 17:26:46 2016 -0500

    Re-enable disabled sort tests from issue #995
---
 test/sort_by_key.cpp | 5 ++---
 test/sort_index.cpp  | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/sort_by_key.cpp b/test/sort_by_key.cpp
index 3d82b9f..289e407 100644
--- a/test/sort_by_key.cpp
+++ b/test/sort_by_key.cpp
@@ -116,9 +116,8 @@ void sortTest(string pTestFile, const bool dir, const unsigned resultIdx0, const
     SORT_INIT(Sort10x10False, sort_by_key_2D,    false, 2, 3);
     SORT_INIT(Sort1000True,   sort_by_key_1000,  true,  0, 1);
     SORT_INIT(SortMedTrue,    sort_by_key_med,   true,  0, 1);
-    // FIXME: below two tests are disabled temporarily until issue#995 is fixed
-    //SORT_INIT(Sort1000False,  sort_by_key_1000,  false, 2, 3);
-    //SORT_INIT(SortMedFalse,   sort_by_key_med,   false, 2, 3);
+    SORT_INIT(Sort1000False,  sort_by_key_1000,  false, 2, 3);
+    SORT_INIT(SortMedFalse,   sort_by_key_med,   false, 2, 3);
     // Takes too much time in current implementation. Enable when everything is parallel
     //SORT_INIT(SortLargeTrue,  sort_by_key_large, true,  0, 1);
     //SORT_INIT(SortLargeFalse, sort_by_key_large, false, 2, 3);
diff --git a/test/sort_index.cpp b/test/sort_index.cpp
index 0711e8b..abe7910 100644
--- a/test/sort_index.cpp
+++ b/test/sort_index.cpp
@@ -117,9 +117,8 @@ void sortTest(string pTestFile, const bool dir, const unsigned resultIdx0, const
     SORT_INIT(Sort10x10False, sort_10x10, false, 2, 3);
     SORT_INIT(Sort1000True,   sort_1000,  true,  0, 1);
     SORT_INIT(SortMedTrue,    sort_med1,  true,  0, 1);
-    // FIXME: below two tests are disabled temporarily until issue#995 is fixed
-    //SORT_INIT(Sort1000False,  sort_1000,  false, 2, 3);
-    //SORT_INIT(SortMedFalse,   sort_med1,  false, 2, 3);
+    SORT_INIT(Sort1000False,  sort_1000,  false, 2, 3);
+    SORT_INIT(SortMedFalse,   sort_med1,  false, 2, 3);
     // Takes too much time in current implementation. Enable when everything is parallel
     //SORT_INIT(SortMed5True,   sort_med,   true,  0, 1);
     //SORT_INIT(SortMed5False,  sort_med,   false, 2, 3);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git