Commit 9853f27a authored by legoc's avatar legoc

Merge branch 'master' of https://code.ill.fr/cameo/cameo-tests.git

Conflicts:
	README.md
parents 87659f8f 15a661f2
...@@ -39,23 +39,23 @@ Linux ...@@ -39,23 +39,23 @@ Linux
The Java and C++ tests can be run using either jzmq or jeromq. The Java and C++ tests can be run using either jzmq or jeromq.
To run all the tests with 10 iterations for each individual test: To run all the tests with 10 iterations for each individual test:
* Start the server with jzmq in a separate shell Start the server with jzmq in a separate shell
> java -classpath target/cameo-tests-jzmq-0.0.1-full.jar fr.ill.ics.cameo.server.Server jzmq-api-config.xml > java -classpath target/cameo-tests-jzmq-0.0.1-full.jar fr.ill.ics.cameo.server.Server jzmq-api-config.xml
* Or start the server with jeromq in a separate shell Or start the server with jeromq in a separate shell
> java -classpath target/cameo-tests-jeromq-0.0.1-full.jar fr.ill.ics.cameo.server.Server jeromq-api-config.xml > java -classpath target/cameo-tests-jeromq-0.0.1-full.jar fr.ill.ics.cameo.server.Server jeromq-api-config.xml
* Start all the tests Start all the tests
> java -jar target/cameo-tests-jzmq-0.0.1-full.jar all 10 > java -jar target/cameo-tests-jzmq-0.0.1-full.jar all 10
* Display the available tests Display the available tests
> java -jar target/cameo-tests-jzmq-0.0.1-full.jar > java -jar target/cameo-tests-jzmq-0.0.1-full.jar
* Start a specific test Start a specific test
> java -jar target/cameo-tests-jzmq-0.0.1-full.jar startsimplejava 100 > java -jar target/cameo-tests-jzmq-0.0.1-full.jar startsimplejava 100
...@@ -66,16 +66,16 @@ Windows ...@@ -66,16 +66,16 @@ Windows
The Java and C++ tests can be run using the jzmq-win-api-config.xml after having been compiled. Edit the win-environment.properties file to modify the path for the C++ executables. If you get the Cameo binaries without compiling the sources, you need to install Visual C++ Redistributable 2015. The Java and C++ tests can be run using the jzmq-win-api-config.xml after having been compiled. Edit the win-environment.properties file to modify the path for the C++ executables. If you get the Cameo binaries without compiling the sources, you need to install Visual C++ Redistributable 2015.
To run all the tests with 10 iterations for each individual test: To run all the tests with 10 iterations for each individual test:
* Start the server in a separate shell Start the server in a separate shell
> set PATH=%ZEROMQ_HOME%\bin\x64;%PATH% > set PATH=%ZEROMQ_HOME%\bin\x64;%PATH%
> java -Djava.library.path=%ZEROMQ_HOME%\java\lib -classpath target\cameo-tests-jzmq-0.0.1-full.jar fr.ill.ics.cameo.server.Server jzmq-win-api-config.xml > java -Djava.library.path=%ZEROMQ_HOME%\java\lib -classpath target\cameo-tests-jzmq-0.0.1-full.jar fr.ill.ics.cameo.server.Server jzmq-win-api-config.xml
* Start all the tests Start all the tests
> java -Djava.library.path=%ZEROMQ_HOME%\java\lib -jar target\cameo-tests-jzmq-0.0.1-full.jar all 10 > java -Djava.library.path=%ZEROMQ_HOME%\java\lib -jar target\cameo-tests-jzmq-0.0.1-full.jar all 10
* Display the available tests Display the available tests
> java -Djava.library.path=%ZEROMQ_HOME%\java\lib -jar target\cameo-tests-jzmq-0.0.1-full.jar > java -Djava.library.path=%ZEROMQ_HOME%\java\lib -jar target\cameo-tests-jzmq-0.0.1-full.jar
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment