[OMPT-svn-commit] SF.net SVN: modplug:[3372] trunk/OpenMPT

[<man...@us...>]

Revision: 3372
          http://sourceforge.net/p/modplug/code/3372
Author:   manxorist
Date:     2013-12-05 10:34:02 +0000 (Thu, 05 Dec 2013)
Log Message:
-----------
[Ref] libopenmpt: Run tests out of checkout root directory instead of 1 level deep.

Modified Paths:
--------------
    trunk/OpenMPT/build/auto/test_libopenmpt_win32.cmd
    trunk/OpenMPT/build/auto/test_libopenmpt_win64.cmd
    trunk/OpenMPT/openmpt123/Makefile
    trunk/OpenMPT/test/test.cpp

Modified: trunk/OpenMPT/build/auto/test_libopenmpt_win32.cmd
===================================================================
--- trunk/OpenMPT/build/auto/test_libopenmpt_win32.cmd	2013-12-04 20:06:04 UTC (rev 3371)
+++ trunk/OpenMPT/build/auto/test_libopenmpt_win32.cmd	2013-12-05 10:34:02 UTC (rev 3372)
@@ -5,9 +5,7 @@
 
 
 
-cd bin || goto error
-Win32\libopenmpt_test.exe || goto error
-cd .. || goto error
+bin\Win32\libopenmpt_test.exe || goto error
 
 
 

Modified: trunk/OpenMPT/build/auto/test_libopenmpt_win64.cmd
===================================================================
--- trunk/OpenMPT/build/auto/test_libopenmpt_win64.cmd	2013-12-04 20:06:04 UTC (rev 3371)
+++ trunk/OpenMPT/build/auto/test_libopenmpt_win64.cmd	2013-12-05 10:34:02 UTC (rev 3372)
@@ -5,9 +5,7 @@
 
 
 
-cd bin || goto error
-x64\libopenmpt_test.exe || goto error
-cd .. || goto error
+bin\x64\libopenmpt_test.exe || goto error
 
 
 

Modified: trunk/OpenMPT/openmpt123/Makefile
===================================================================
--- trunk/OpenMPT/openmpt123/Makefile	2013-12-04 20:06:04 UTC (rev 3371)
+++ trunk/OpenMPT/openmpt123/Makefile	2013-12-05 10:34:02 UTC (rev 3372)
@@ -300,7 +300,7 @@
 
 .PHONY: test
 test: bin/libopenmpt_test$(EXESUFFIX)
-	bin/libopenmpt_test$(EXESUFFIX)
+	( cd .. && openmpt123/bin/libopenmpt_test$(EXESUFFIX) )
 
 bin/libopenmpt_test$(EXESUFFIX): $(LIBOPENMPTTEST_OBJECTS) $(OBJECTS_LIBOPENMPT) $(OUTPUT_LIBOPENMPT)
 	$(INFO) [LD ] $@

Modified: trunk/OpenMPT/test/test.cpp
===================================================================
--- trunk/OpenMPT/test/test.cpp	2013-12-04 20:06:04 UTC (rev 3371)
+++ trunk/OpenMPT/test/test.cpp	2013-12-05 10:34:02 UTC (rev 3372)
@@ -1641,7 +1641,7 @@
 
 static mpt::PathString GetTestFilenameBase()
 {
-	return MPT_PATHSTRING("../test/test.");
+	return MPT_PATHSTRING("./test/test.");
 }
 
 typedef std::shared_ptr<CSoundFile> TSoundFileContainer;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.