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

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

Revision: 5131
          http://sourceforge.net/p/modplug/code/5131
Author:   manxorist
Date:     2015-05-21 10:17:24 +0000 (Thu, 21 May 2015)
Log Message:
-----------
[Fix] build: Newer emscripten apparently do generate 2 output files. A .js and a .js.mem file. Make the test suite work in the case.

Modified Paths:
--------------
    trunk/OpenMPT/Makefile
    trunk/OpenMPT/build/make/test-pre.js

Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile	2015-05-21 09:52:14 UTC (rev 5130)
+++ trunk/OpenMPT/Makefile	2015-05-21 10:17:24 UTC (rev 5131)
@@ -585,8 +585,10 @@
 MISC_OUTPUTS += libopenmpt$(SOSUFFIX)
 MISC_OUTPUTS += bin/.docs
 MISC_OUTPUTS += bin/libopenmpt_test$(EXESUFFIX)
+MISC_OUTPUTS += bin/libopenmpt_test.js.mem
 MISC_OUTPUTS += bin/made.docs
 MISC_OUTPUTS += bin/$(LIBOPENMPT_SONAME)
+MISC_OUTPUTS += bin/libopenmpt.js.mem
 MISC_OUTPUTS += bin/openmpt.a
 
 MISC_OUTPUTDIRS += bin/dest
@@ -633,7 +635,11 @@
 
 .PHONY: test
 test: bin/libopenmpt_test$(EXESUFFIX)
-	$(RUNPREFIX) bin/libopenmpt_test$(EXESUFFIX)
+ifeq ($(CONFIG),emscripten)
+	cd bin && $(RUNPREFIX) libopenmpt_test$(EXESUFFIX)
+else
+	bin/libopenmpt_test$(EXESUFFIX)
+endif
 
 bin/libopenmpt_test$(EXESUFFIX): $(LIBOPENMPTTEST_OBJECTS) 
 	$(INFO) [LD-TEST] $@

Modified: trunk/OpenMPT/build/make/test-pre.js
===================================================================
--- trunk/OpenMPT/build/make/test-pre.js	2015-05-21 09:52:14 UTC (rev 5130)
+++ trunk/OpenMPT/build/make/test-pre.js	2015-05-21 10:17:24 UTC (rev 5131)
@@ -2,6 +2,6 @@
 var Module = {
  'preInit': function(text) {
   FS.mkdir('/test');
-  FS.mount(NODEFS, {'root': './test/'}, '/test');
+  FS.mount(NODEFS, {'root': '../test/'}, '/test');
  }
 };

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