backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-25 15:37:52 +01:00
Code Issues Projects Releases Activity

Use NODE_PATH instead linking to wabt to improve test speed.

Browse Source
This commit is contained in:
Volker Berlin 2020-05-02 21:42:32 +02:00
parent c4ed671b99
commit daaa648a04
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/de/inetsoftware/jwebassembly/WasmRule.java
View File

@ -61,6 +61,8 @@ public class WasmRule extends TemporaryFolder {
private static boolean npmWabtNightly; private static boolean npmWabtNightly;
private static String nodeModulePath;
private final Class<?>[] classes; private final Class<?>[] classes;
private final JWebAssembly compiler; private final JWebAssembly compiler;
@ -268,14 +270,30 @@ public class WasmRule extends TemporaryFolder {
} }
execute( processBuilder ); execute( processBuilder );
} }
}
}
ProcessBuilder processBuilder = new ProcessBuilder( "npm", "link", "wabt" ); /**
* Get the path of the global installed module pathes.
*
* @return the path
* @throws Exception
* if any error occur.
*/
private static String getNodeModulePath() throws Exception {
if( nodeModulePath == null ) {
ProcessBuilder processBuilder = new ProcessBuilder( "npm", "root", "-g" );
if( IS_WINDOWS ) { if( IS_WINDOWS ) {
processBuilder.command().add( 0, "cmd" ); processBuilder.command().add( 0, "cmd" );
processBuilder.command().add( 1, "/C" ); processBuilder.command().add( 1, "/C" );
} }
execute( processBuilder ); Process process = processBuilder.start();
int exitCode = process.waitFor();
nodeModulePath = readStream( process.getInputStream() ).trim(); // module install path
System.out.println( "node global module path: " + nodeModulePath );
} }
return nodeModulePath;
} }
/** /**
@ -456,7 +474,9 @@ public class WasmRule extends TemporaryFolder {
return nodeJsCommand( nodeScript ); return nodeJsCommand( nodeScript );
case NodeWat: case NodeWat:
prepareNodeWat(); prepareNodeWat();
return nodeJsCommand( nodeWatScript ); ProcessBuilder processBuilder = nodeJsCommand( nodeWatScript );
processBuilder.environment().put( "NODE_PATH", getNodeModulePath() );
return processBuilder;
case Wat2Wasm: case Wat2Wasm:
prepareWat2Wasm(); prepareWat2Wasm();
return nodeJsCommand( wat2WasmScript ); return nodeJsCommand( wat2WasmScript );