Skip to content

Commit 81820b3

Browse files
committed
Split debug/release unit test object files.
This avoids debug/release code being mixed when switching between configurations and making the tests crash in weird ways.
1 parent 45b898f commit 81820b3

File tree

1 file changed

+52
-52
lines changed

1 file changed

+52
-52
lines changed

Makefile

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -564,57 +564,57 @@ TEST_OBJS := \
564564
src/VirtualMappingDialog.$(BUILD_TYPE).o \
565565
src/win32lib.$(BUILD_TYPE).o \
566566
src/WindowCommands.$(BUILD_TYPE).o \
567-
tests/BitmapTool.o \
568-
tests/BitOffset.o \
569-
tests/BufferTest1.o \
570-
tests/BufferTest2.o \
571-
tests/BufferTest3.o \
572-
tests/ByteAccumulator.o \
573-
tests/ByteColourMap.o \
574-
tests/ByteRangeMap.o \
575-
tests/ByteRangeSet.o \
576-
tests/ByteRangeTree.o \
577-
tests/CharacterEncoder.o \
578-
tests/CharacterFinder.o \
579-
tests/Checksum.o \
580-
tests/CommentsDataObject.o \
581-
tests/CommentTree.o \
582-
tests/ConsoleBuffer.o \
583-
tests/CustomNumericType.o \
584-
tests/DataType.o \
585-
tests/DataView.o \
586-
tests/DataHistogramAccumulator.o \
587-
tests/DiffWindow.o \
588-
tests/DisassemblyRegion.o \
589-
tests/Document.o \
590-
tests/DocumentCtrl.o \
591-
tests/endian_conv.o \
592-
tests/FastRectangleFiller.o \
593-
tests/FileWriter.o \
594-
tests/HierarchicalByteAccumulator.o \
595-
tests/HighlightColourMap.o \
596-
tests/HSVColour.o \
597-
tests/IntelHexExport.o \
598-
tests/IntelHexImport.o \
599-
tests/LuaPluginLoader.o \
600-
tests/main.o \
601-
tests/NestedOffsetLengthMap.o \
602-
tests/NumericTextCtrl.o \
603-
tests/MultiSplitter.o \
604-
tests/Range.o \
605-
tests/RangeProcessor.o \
606-
tests/search-bseq.o \
607-
tests/search-text.o \
608-
tests/SearchBase.o \
609-
tests/SearchValue.o \
610-
tests/SafeWindowPointer.o \
611-
tests/SharedDocumentPointer.o \
612-
tests/StringPanel.o \
613-
tests/Tab.o \
614-
tests/testutil.o \
615-
tests/ThreadPool.o \
616-
tests/util.o \
617-
tests/WindowCommands.o \
567+
tests/BitmapTool.$(BUILD_TYPE).o \
568+
tests/BitOffset.$(BUILD_TYPE).o \
569+
tests/BufferTest1.$(BUILD_TYPE).o \
570+
tests/BufferTest2.$(BUILD_TYPE).o \
571+
tests/BufferTest3.$(BUILD_TYPE).o \
572+
tests/ByteAccumulator.$(BUILD_TYPE).o \
573+
tests/ByteColourMap.$(BUILD_TYPE).o \
574+
tests/ByteRangeMap.$(BUILD_TYPE).o \
575+
tests/ByteRangeSet.$(BUILD_TYPE).o \
576+
tests/ByteRangeTree.$(BUILD_TYPE).o \
577+
tests/CharacterEncoder.$(BUILD_TYPE).o \
578+
tests/CharacterFinder.$(BUILD_TYPE).o \
579+
tests/Checksum.$(BUILD_TYPE).o \
580+
tests/CommentsDataObject.$(BUILD_TYPE).o \
581+
tests/CommentTree.$(BUILD_TYPE).o \
582+
tests/ConsoleBuffer.$(BUILD_TYPE).o \
583+
tests/CustomNumericType.$(BUILD_TYPE).o \
584+
tests/DataType.$(BUILD_TYPE).o \
585+
tests/DataView.$(BUILD_TYPE).o \
586+
tests/DataHistogramAccumulator.$(BUILD_TYPE).o \
587+
tests/DiffWindow.$(BUILD_TYPE).o \
588+
tests/DisassemblyRegion.$(BUILD_TYPE).o \
589+
tests/Document.$(BUILD_TYPE).o \
590+
tests/DocumentCtrl.$(BUILD_TYPE).o \
591+
tests/endian_conv.$(BUILD_TYPE).o \
592+
tests/FastRectangleFiller.$(BUILD_TYPE).o \
593+
tests/FileWriter.$(BUILD_TYPE).o \
594+
tests/HierarchicalByteAccumulator.$(BUILD_TYPE).o \
595+
tests/HighlightColourMap.$(BUILD_TYPE).o \
596+
tests/HSVColour.$(BUILD_TYPE).o \
597+
tests/IntelHexExport.$(BUILD_TYPE).o \
598+
tests/IntelHexImport.$(BUILD_TYPE).o \
599+
tests/LuaPluginLoader.$(BUILD_TYPE).o \
600+
tests/main.$(BUILD_TYPE).o \
601+
tests/NestedOffsetLengthMap.$(BUILD_TYPE).o \
602+
tests/NumericTextCtrl.$(BUILD_TYPE).o \
603+
tests/MultiSplitter.$(BUILD_TYPE).o \
604+
tests/Range.$(BUILD_TYPE).o \
605+
tests/RangeProcessor.$(BUILD_TYPE).o \
606+
tests/search-bseq.$(BUILD_TYPE).o \
607+
tests/search-text.$(BUILD_TYPE).o \
608+
tests/SearchBase.$(BUILD_TYPE).o \
609+
tests/SearchValue.$(BUILD_TYPE).o \
610+
tests/SafeWindowPointer.$(BUILD_TYPE).o \
611+
tests/SharedDocumentPointer.$(BUILD_TYPE).o \
612+
tests/StringPanel.$(BUILD_TYPE).o \
613+
tests/Tab.$(BUILD_TYPE).o \
614+
tests/testutil.$(BUILD_TYPE).o \
615+
tests/ThreadPool.$(BUILD_TYPE).o \
616+
tests/util.$(BUILD_TYPE).o \
617+
tests/WindowCommands.$(BUILD_TYPE).o \
618618
$(WXLUA_OBJS) \
619619
$(WXBIND_OBJS) \
620620
$(EXTRA_TEST_OBJS)
@@ -688,7 +688,7 @@ src/lua-plugin-preload.c src/lua-plugin-preload.h: src/lua-plugin-preload.done ;
688688
$(CC) $(CFLAGS) $(DEPFLAGS) -c -o $@ $<
689689
$(DEPPOST)
690690

691-
tests/%.o: tests/%.cpp $(WXLUA_BINDINGS) $(GTKCONFIG_EXE)
691+
tests/%.$(BUILD_TYPE).o: tests/%.cpp $(WXLUA_BINDINGS) $(GTKCONFIG_EXE)
692692
$(DEPPRE)
693693
$(CXX) $(CXXFLAGS) -I./googletest/include/ $(DEPFLAGS) -c -o $@ $<
694694
$(DEPPOST)

0 commit comments

Comments
 (0)