Skip to content

Commit 7c65df9

Browse files
authored
Merge pull request #1074 from Idclip/ax_string_test_fix
Renamed backend/TestString.cc to avoid overwriting integration/TestString.cc
2 parents a9440c4 + 1decb45 commit 7c65df9

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

openvdb_ax/openvdb_ax/test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ set(TEST_SOURCE_FILES
3636
backend/TestFunctionRegistry.cc
3737
backend/TestFunctionTypes.cc
3838
backend/TestLogger.cc
39-
backend/TestString.cc
39+
backend/TestStringIR.cc
4040
backend/TestSymbolTable.cc
4141
backend/TestTypes.cc
4242
compiler/TestAXRun.cc

openvdb_ax/openvdb_ax/test/backend/TestString.cc renamed to openvdb_ax/openvdb_ax/test/backend/TestStringIR.cc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
using String = openvdb::ax::codegen::String;
1414

15-
class TestString : public CppUnit::TestCase
15+
class TestStringIR : public CppUnit::TestCase
1616
{
1717
public:
1818

19-
CPPUNIT_TEST_SUITE(TestString);
19+
CPPUNIT_TEST_SUITE(TestStringIR);
2020
CPPUNIT_TEST(testStringImpl);
2121
CPPUNIT_TEST(testStringStringIR);
2222
CPPUNIT_TEST(testStringAssignIR);
@@ -31,10 +31,10 @@ class TestString : public CppUnit::TestCase
3131
void testStringClearIR();
3232
};
3333

34-
CPPUNIT_TEST_SUITE_REGISTRATION(TestString);
34+
CPPUNIT_TEST_SUITE_REGISTRATION(TestStringIR);
3535

3636
void
37-
TestString::testStringImpl()
37+
TestStringIR::testStringImpl()
3838
{
3939
// Test the C++ implementation
4040

@@ -269,7 +269,7 @@ TestString::testStringImpl()
269269
}
270270

271271
void
272-
TestString::testStringStringIR()
272+
TestStringIR::testStringStringIR()
273273
{
274274
static auto setInvalidString = [](String& S) {
275275
#if defined(__GNUC__) && !defined(__clang__)
@@ -403,7 +403,7 @@ TestString::testStringStringIR()
403403

404404

405405
void
406-
TestString::testStringAssignIR()
406+
TestStringIR::testStringAssignIR()
407407
{
408408
// Test the String IR in StringFunctions.cc
409409

@@ -514,7 +514,7 @@ TestString::testStringAssignIR()
514514
}
515515

516516

517-
void TestString::testStringAddIR()
517+
void TestStringIR::testStringAddIR()
518518
{
519519
// Test the String IR in StringFunctions.cc
520520

@@ -674,7 +674,7 @@ void TestString::testStringAddIR()
674674
}
675675

676676

677-
void TestString::testStringClearIR()
677+
void TestStringIR::testStringClearIR()
678678
{
679679
// Test the String IR in StringFunctions.cc
680680

0 commit comments

Comments
 (0)