Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Tests] Remove broken macro for MSVC array swap #2073

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[Tests] Remove broken macro for MSVC array swap #2073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions test/support/test_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,6 @@
#define TEST_GCC10_EXCLUSIVE_SCAN_BROKEN (_GLIBCXX_RELEASE == 10)
// GCC7 std::get doesn't return const rvalue reference from const rvalue reference of tuple
#define _PSTL_TEST_GCC7_RVALUE_TUPLE_GET_BROKEN (_GLIBCXX_RELEASE > 0 && _GLIBCXX_RELEASE < 8)
// Array swap broken on Windows because Microsoft implementation of std::swap function for std::array
// call some internal function which is not declared as SYCL external and we have compile error
#if defined(_MSC_VER)
# define TEST_XPU_ARRAY_SWAP_BROKEN (_MSC_VER <= 1937)
#else
# define TEST_XPU_ARRAY_SWAP_BROKEN 0
#endif

#define _PSTL_SYCL_TEST_USM 1

Expand Down
4 changes: 1 addition & 3 deletions test/xpu_api/containers/sequences/array/array.special/swap1.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
int
main()
{
#if !TEST_XPU_ARRAY_SWAP_BROKEN
bool ret = true;
{
sycl::buffer<bool, 1> buf(&ret, sycl::range<1>{1});
Expand Down Expand Up @@ -67,7 +66,6 @@ main()
}

EXPECT_TRUE(ret, "Wrong result of work with dpl::swap(dpl::array, dpl::array)");
#endif // !TEST_XPU_ARRAY_SWAP_BROKEN

return TestUtils::done(!TEST_XPU_ARRAY_SWAP_BROKEN);
return TestUtils::done();
}
6 changes: 1 addition & 5 deletions test/xpu_api/containers/sequences/array/array.swap/swap.pass.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

#include "support/utils.h"

#if !TEST_XPU_ARRAY_SWAP_BROKEN
class KernelTest1;

bool
Expand Down Expand Up @@ -96,15 +95,12 @@ kernel_test()
}
return ret;
}
#endif // !TEST_XPU_ARRAY_SWAP_BROKEN

int
main()
{
#if !TEST_XPU_ARRAY_SWAP_BROKEN
auto ret = kernel_test();
EXPECT_TRUE(ret, "Wrong result of work with dpl::swap");
#endif // !TEST_XPU_ARRAY_SWAP_BROKEN

return TestUtils::done(!TEST_XPU_ARRAY_SWAP_BROKEN);
return TestUtils::done();
}
Loading