[arrayfire] 66/84: TESTS Removed typed_test from info.cpp
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Mon Jan 4 23:22:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository arrayfire.
commit a75590bff63daa72872c9f0956f819264b661c22
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date: Tue Dec 29 14:34:24 2015 -0500
TESTS Removed typed_test from info.cpp
---
test/info.cpp | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/test/info.cpp b/test/info.cpp
index ff2cea6..e0e45ed 100644
--- a/test/info.cpp
+++ b/test/info.cpp
@@ -22,20 +22,6 @@ using std::string;
using std::vector;
template<typename T>
-class Info : public ::testing::Test
-{
- public:
- virtual void SetUp() {
- }
-};
-
-// create a list of types to be tested
-typedef ::testing::Types<float> TestTypes;
-
-// register the type list
-TYPED_TEST_CASE(Info, TestTypes);
-
-template<typename T>
void testFunction()
{
af::info();
@@ -47,14 +33,11 @@ void testFunction()
if(outArray != 0) ASSERT_EQ(AF_SUCCESS, af_release_array(outArray));
}
-template<typename T>
void infoTest()
{
- if (noDoubleTests<T>()) return;
-
const char* ENV = getenv("AF_MULTI_GPU_TESTS");
if(ENV && ENV[0] == '0') {
- testFunction<T>();
+ testFunction<float>();
} else {
int nDevices = 0;
ASSERT_EQ(AF_SUCCESS, af_get_device_count(&nDevices));
@@ -62,13 +45,13 @@ void infoTest()
int oldDevice = af::getDevice();
for(int d = 0; d < nDevices; d++) {
af::setDevice(d);
- testFunction<T>();
+ testFunction<float>();
}
af::setDevice(oldDevice);
}
}
-TYPED_TEST(Info, All)
+TEST(Info, All)
{
- infoTest<TypeParam>();
+ infoTest();
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git
More information about the debian-science-commits
mailing list