Menu
▾
▴
[OMPT-svn-commit] SF.net SVN: modplug:[2191] trunk/OpenMPT
|
From: <man...@us...> - 2013-05-25 12:33:26
|
Revision: 2191
http://sourceforge.net/p/modplug/code/2191
Author: manxorist
Date: 2013-05-25 12:33:18 +0000 (Sat, 25 May 2013)
Log Message:
-----------
[Ref] Move test suite out of mptrack subdiretory. The goal is to make it usable with libopenmpt.
Modified Paths:
--------------
trunk/OpenMPT/common/BuildSettings.h
trunk/OpenMPT/mptrack/Mptrack.cpp
trunk/OpenMPT/mptrack/mptrack_08.vcproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj
trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
trunk/OpenMPT/test/test.cpp
trunk/OpenMPT/test/test.h
Added Paths:
-----------
trunk/OpenMPT/test/
Removed Paths:
-------------
trunk/OpenMPT/mptrack/test/
Modified: trunk/OpenMPT/common/BuildSettings.h
===================================================================
--- trunk/OpenMPT/common/BuildSettings.h 2013-05-25 12:08:42 UTC (rev 2190)
+++ trunk/OpenMPT/common/BuildSettings.h 2013-05-25 12:33:18 UTC (rev 2191)
@@ -60,6 +60,11 @@
#elif defined(MODPLUG_TRACKER)
+// Enable built-in test suite.
+#ifdef _DEBUG
+#define ENABLE_TESTS
+#endif
+
// Disable any file saving functionality (not really useful except for the player library)
//#define MODPLUG_NO_FILESAVE
@@ -122,6 +127,7 @@
#elif defined(LIBOPENMPT_BUILD)
+#define ENABLE_TESTS
#define MODPLUG_NO_FILESAVE
//#define NO_LOGGING
#define NO_ARCHIVE_SUPPORT
Modified: trunk/OpenMPT/mptrack/Mptrack.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Mptrack.cpp 2013-05-25 12:08:42 UTC (rev 2190)
+++ trunk/OpenMPT/mptrack/Mptrack.cpp 2013-05-25 12:33:18 UTC (rev 2191)
@@ -21,7 +21,7 @@
#include "hyperEdit.h"
#include "commctrl.h"
#include "../common/version.h"
-#include "test/test.h"
+#include "../test/test.h"
#include <afxadv.h>
#include <shlwapi.h>
#include "UpdateCheck.h"
Modified: trunk/OpenMPT/mptrack/mptrack_08.vcproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_08.vcproj 2013-05-25 12:08:42 UTC (rev 2190)
+++ trunk/OpenMPT/mptrack/mptrack_08.vcproj 2013-05-25 12:33:18 UTC (rev 2191)
@@ -1301,11 +1301,11 @@
Name="test"
>
<File
- RelativePath=".\test\test.cpp"
+ RelativePath="..\test\test.cpp"
>
</File>
<File
- RelativePath=".\test\test.h"
+ RelativePath="..\test\test.h"
>
</File>
</Filter>
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-05-25 12:08:42 UTC (rev 2190)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj 2013-05-25 12:33:18 UTC (rev 2191)
@@ -299,6 +299,7 @@
<ClCompile Include="..\soundlib\WAVTools.cpp" />
<ClCompile Include="..\soundlib\WindowedFIR.cpp" />
<ClCompile Include="..\soundlib\XMTools.cpp" />
+ <ClCompile Include="..\test\test.cpp" />
<ClCompile Include="..\unarchiver\unarchiver.cpp" />
<ClCompile Include="..\unarchiver\ungzip.cpp" />
<ClCompile Include="..\unarchiver\unlha.cpp" />
@@ -461,7 +462,6 @@
<ClCompile Include="TrackerSettings.cpp" />
<ClCompile Include="TuningDialog.cpp" />
<ClCompile Include="tuningRatioMapWnd.cpp" />
- <ClCompile Include="test\test.cpp" />
<ClCompile Include="..\soundlib\Load_669.cpp" />
<ClCompile Include="..\Soundlib\load_amf.cpp" />
<ClCompile Include="..\soundlib\Load_ams.cpp" />
@@ -563,6 +563,7 @@
<ClInclude Include="..\soundlib\WAVTools.h" />
<ClInclude Include="..\soundlib\WindowedFIR.h" />
<ClInclude Include="..\soundlib\XMTools.h" />
+ <ClInclude Include="..\test\test.h" />
<ClInclude Include="..\unarchiver\unarchiver.h" />
<ClInclude Include="..\unarchiver\ungzip.h" />
<ClInclude Include="..\unarchiver\unlha.h" />
@@ -640,7 +641,6 @@
<ClInclude Include="TrackerSettings.h" />
<ClInclude Include="TuningDialog.h" />
<ClInclude Include="tuningRatioMapWnd.h" />
- <ClInclude Include="test\test.h" />
<ClInclude Include="..\soundlib\Loaders.h" />
<ClInclude Include="Undo.h" />
<ClInclude Include="UpdateCheck.h" />
Modified: trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters
===================================================================
--- trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2013-05-25 12:08:42 UTC (rev 2190)
+++ trunk/OpenMPT/mptrack/mptrack_10.vcxproj.filters 2013-05-25 12:33:18 UTC (rev 2191)
@@ -85,9 +85,6 @@
<ClCompile Include="..\soundlib\load_dbm.cpp">
<Filter>Source Files\soundlib\Module Loaders</Filter>
</ClCompile>
- <ClCompile Include="test\test.cpp">
- <Filter>test</Filter>
- </ClCompile>
<ClCompile Include="ChannelManagerDlg.cpp">
<Filter>Source Files\mptrack\Dialogs</Filter>
</ClCompile>
@@ -511,6 +508,9 @@
<ClCompile Include="..\unarchiver\unrar\UNPOLD.CPP">
<Filter>Source Files\unarchiver\unrar</Filter>
</ClCompile>
+ <ClCompile Include="..\test\test.cpp">
+ <Filter>test</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\soundlib\Loaders.h">
@@ -525,9 +525,6 @@
<ClInclude Include="..\soundlib\tuningcollection.h">
<Filter>Header Files\soundlib\Tuning</Filter>
</ClInclude>
- <ClInclude Include="test\test.h">
- <Filter>test</Filter>
- </ClInclude>
<ClInclude Include="ChannelManagerDlg.h">
<Filter>Header Files\mptrack\Dialogs</Filter>
</ClInclude>
@@ -918,6 +915,9 @@
<ClInclude Include="..\common\CompilerDetect.h">
<Filter>Header Files\common</Filter>
</ClInclude>
+ <ClInclude Include="..\test\test.h">
+ <Filter>test</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="res\bitmap1.bmp">
Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/mptrack/test/test.cpp 2013-05-25 12:08:42 UTC (rev 2190)
+++ trunk/OpenMPT/test/test.cpp 2013-05-25 12:33:18 UTC (rev 2191)
@@ -15,16 +15,17 @@
#ifdef ENABLE_TESTS
-#include "../mptrack.h"
-#include "../moddoc.h"
-#include "../MainFrm.h"
-#include "../../common/version.h"
-#include "../../soundlib/MIDIEvents.h"
-#include "../../soundlib/MIDIMacros.h"
-#include "../../common/misc_util.h"
-#include "../../common/StringFixer.h"
-#include "../../common/serialization_utils.h"
-#include "../../soundlib/SampleFormatConverters.h"
+#include "../common/version.h"
+#include "../common/misc_util.h"
+#include "../common/StringFixer.h"
+#include "../common/serialization_utils.h"
+#include "../soundlib/Sndfile.h"
+#include "../soundlib/MIDIEvents.h"
+#include "../soundlib/MIDIMacros.h"
+#include "../soundlib/SampleFormatConverters.h"
+#include "../mptrack/mptrack.h"
+#include "../mptrack/moddoc.h"
+#include "../mptrack/MainFrm.h"
#include <limits>
#include <istream>
#include <ostream>
@@ -938,7 +939,7 @@
if(theFile.Mid(theFile.GetLength() - 6, 5) != "Debug")
return;
theFile.Delete(theFile.GetLength() - 6, 6);
- theFile.Append("test/test.");
+ theFile.Append("../test/test.");
// Test MPTM file loading
{
Modified: trunk/OpenMPT/test/test.h
===================================================================
--- trunk/OpenMPT/mptrack/test/test.h 2013-05-25 12:08:42 UTC (rev 2190)
+++ trunk/OpenMPT/test/test.h 2013-05-25 12:33:18 UTC (rev 2191)
@@ -11,10 +11,6 @@
#pragma once
-#ifdef _DEBUG
- #define ENABLE_TESTS
-#endif
-
namespace MptTest
{
void DoTests();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
