From: navarrop Date: Mon, 28 Feb 2011 10:17:10 +0000 (+0000) Subject: Add svn and cdash to java project. X-Git-Tag: v3_9_90~569^2~19^2~195 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fe0da55b4a4be0b7b074f24f32c44d3cbad9c1b4 Add svn and cdash to java project. Add new tests in java. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/contrib/trunk/simgrid-java@9727 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 96435edf9e..c4c81c0014 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,9 +4,58 @@ set(UPDATE_TYPE svn) set(CMAKE_C_FLAGS "" CACHE TYPE INTERNAL FORCE) set(CMAKE_EXE_LINKER_FLAGS "" CACHE TYPE INTERNAL FORCE) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_HOME_DIRECTORY}/lib") +set(soversion 1) +######## +## SVN # +######## +if(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn) + find_file(SVN ".svn" ${CMAKE_HOME_DIRECTORY}) + exec_program("svnversion ${CMAKE_HOME_DIRECTORY}" OUTPUT_VARIABLE "SVN_VERSION") +endif(IS_DIRECTORY ${CMAKE_HOME_DIRECTORY}/.svn) + +exec_program("git config --get svn-remote.svn.url" + OUTPUT_VARIABLE url + RETURN_VALUE ret) +if(ret EQUAL 0) + exec_program("git svn info" ${CMAKE_HOME_DIRECTORY} + OUTPUT_VARIABLE "GIT_SVN_VERSION") + string(REPLACE "\n" ";" GIT_SVN_VERSION ${GIT_SVN_VERSION}) + foreach(line ${GIT_SVN_VERSION}) + string(REGEX MATCH "^Revision:.*" line_good ${line}) + if(line_good) + string(REPLACE "Revision: " "" + line_good ${line_good}) + set(SVN_VERSION ${line_good}) + endif(line_good) + endforeach(line ${GIT_SVN_VERSION}) +endif(ret EQUAL 0) + +message(STATUS "Svn version : ${SVN_VERSION}") +######### +# CDASH # +######### +SET(DROP_METHOD "http") +SET(DROP_SITE "cdash.inria.fr/CDash") +SET(DROP_LOCATION "/submit.php?project=simgrid") +SET(DROP_SITE_CDASH TRUE) +SET(TRIGGER_SITE "http://cdash.inria.fr/CDash/cgi-bin/Submit-Random-TestingResults.cgi") +SET(BUILDNAME "Simgrid-Java" CACHE TYPE INTERNAL FORCE) +set(osname ${CMAKE_SYSTEM_NAME}) +set(cpu ${CMAKE_SYSTEM_PROCESSOR}) +set(DISTRIB2 ${CMAKE_SYSTEM_VERSION}) +SET(SITE "${osname}_${DISTRIB2}_${cpu}") +SET(CTEST_SITE "${osname}_${DISTRIB2}_${cpu}") +SET(CTEST_PROJECT_NAME "${PROJECT_NAME}") +SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "3000000") +SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000") +set(PIPOL_IMAGE $ENV{PIPOL_IMAGE}) +if(NOT ${PIPOL_IMAGE} MATCHES "\n") +set(SITE ${PIPOL_IMAGE}) +endif(NOT ${PIPOL_IMAGE} MATCHES "\n") +message(STATUS "SITE : ${SITE}") +message(STATUS "BUILDNAME : ${BUILDNAME}") -set(soversion 1) ############################### # Test the build dependencies # ############################### @@ -74,27 +123,29 @@ set(JAVA_EXAMPLES examples/pingPong/PingPongTest.java ) -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ") - -set(INCLUDE_PATH "-I${CMAKE_HOME_DIRECTORY}/src -I$ENV{SIMGRID_ROOT}/include -I$ENV{SIMGRID_ROOT}/src -I$ENV{SIMGRID_ROOT}/src/include") -set(LIB_PATH "-L$ENV{SIMGRID_ROOT}/lib") - -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INCLUDE_PATH} ${LIB_PATH}") - string(REPLACE "org/" "${CMAKE_HOME_DIRECTORY}/org/" JAVA_FILES "${JMSG_JAVA_SRC}") - string(REPLACE "org/" "${CMAKE_HOME_DIRECTORY}/classes/org/" JMSG_JAVA_SRC_CLASS "${JMSG_JAVA_SRC}") string(REPLACE ".java" ".class" JMSG_JAVA_SRC_CLASS "${JMSG_JAVA_SRC_CLASS}") - string(REPLACE "examples/" "${CMAKE_HOME_DIRECTORY}/examples/" JAVA_EXAMPLES_CLASS "${JAVA_EXAMPLES}") string(REPLACE ".java" ".class" JAVA_EXAMPLES_CLASS "${JAVA_EXAMPLES_CLASS}") -# TARGET SG_java +######### +# FLAGS # +######### +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wpointer-arith -Wchar-subscripts -Wcomment -Wformat -Wwrite-strings -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing -Wno-format-nonliteral -Werror ") +set(INCLUDE_PATH "-I${CMAKE_HOME_DIRECTORY}/src -I$ENV{SIMGRID_ROOT}/include -I$ENV{SIMGRID_ROOT}/src -I$ENV{SIMGRID_ROOT}/src/include") +set(LIB_PATH "-L$ENV{SIMGRID_ROOT}/lib") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${INCLUDE_PATH} ${LIB_PATH}") + +########### +# TARGETS # +########### +# SG_java add_library(SG_java SHARED ${JMSG_C_SRC}) target_link_libraries(SG_java -lsimgrid) set_target_properties(SG_java PROPERTIES VERSION ${soversion}) -# TARGET java_classes +# java_classes add_custom_command( OUTPUT ${JMSG_JAVA_SRC_CLASS} DEPENDS ${JMSG_JAVA_SRC} @@ -107,14 +158,14 @@ add_custom_target(java_classes ALL DEPENDS ${JMSG_JAVA_SRC_CLASS} ) -# TARGET simgrid_jar +# simgrid_jar add_custom_target(simgrid_jar ALL COMMAND ${JAVA_ARCHIVE} -cvf ${CMAKE_HOME_DIRECTORY}/simgrid.jar . COMMENT "Building simgrid.jar..." WORKING_DIRECTORY ${CMAKE_HOME_DIRECTORY}/classes ) -# TARGET simgrid_java_examples +# simgrid_java_examples add_custom_command( COMMENT "Build examples for java" OUTPUT ${JAVA_EXAMPLES_CLASS} @@ -128,7 +179,9 @@ add_custom_target(simgrid_java_examples ALL DEPENDS ${JAVA_EXAMPLES_CLASS} ) -# Declare dependencies +######################## +# Declare dependencies # +######################## add_dependencies(simgrid_jar java_classes) add_dependencies(simgrid_java_examples simgrid_jar SG_java) @@ -142,20 +195,25 @@ ${CMAKE_HOME_DIRECTORY}/simgrid.jar INCLUDE(CTest) ENABLE_TESTING() -ADD_TEST(java-basic +ADD_TEST(basic java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar basic/BasicTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/basic/basicDeployment.xml ) -ADD_TEST(java-pingPong +ADD_TEST(pingPong java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar pingPong/PingPongTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/pingPong/pingPongDeployment.xml ) +ADD_TEST(CommTime +java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar commTime/CommTimeTest ${CMAKE_HOME_DIRECTORY}/examples/platform.xml ${CMAKE_HOME_DIRECTORY}/examples/commTime/commTimeDeployment.xml +) +ADD_TEST(mutualExclusion +java -cp .:${CMAKE_HOME_DIRECTORY}/examples:${CMAKE_HOME_DIRECTORY}/simgrid.jar mutualExclusion/centralized/MutexCentral ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/ring3.xml ${CMAKE_HOME_DIRECTORY}/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml +) ########################################## # Set the LD_LIBRARY_PATH for our tests # ########################################## -message(STATUS "export LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:$ENV{LD_LIBRARY_PATH}") - -set_tests_properties(java-basic java-pingPong +set_tests_properties(basic pingPong CommTime mutualExclusion PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:$ENV{LD_LIBRARY_PATH}") +message(STATUS "export LD_LIBRARY_PATH=${CMAKE_HOME_DIRECTORY}/lib:$ENV{LD_LIBRARY_PATH}") ########### # Install # diff --git a/examples/commTime/commTimeDeployment.xml b/examples/commTime/commTimeDeployment.xml index 0afeaa124c..828c403d9d 100644 --- a/examples/commTime/commTimeDeployment.xml +++ b/examples/commTime/commTimeDeployment.xml @@ -1,55 +1,55 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml b/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml index b5c7eef413..300dfa8889 100644 --- a/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml +++ b/examples/mutualExclusion/centralized/mutex_centralized_deployment.xml @@ -1,14 +1,14 @@ - - - + + + - + - + diff --git a/examples/mutualExclusion/ring3.xml b/examples/mutualExclusion/ring3.xml index 9f418554de..8a18819908 100644 --- a/examples/mutualExclusion/ring3.xml +++ b/examples/mutualExclusion/ring3.xml @@ -1,6 +1,7 @@ - - + + + @@ -10,28 +11,28 @@ - + - + - + - + - + - + - + diff --git a/org/simgrid/msg/Process.java b/org/simgrid/msg/Process.java index 333e91f4ff..762dddb187 100644 --- a/org/simgrid/msg/Process.java +++ b/org/simgrid/msg/Process.java @@ -335,7 +335,7 @@ public abstract class Process extends Thread { } public void schedule() { - System.err.println("Scheduling process in Java"); + //System.err.println("Scheduling process in Java"); try { schedBegin.release(); schedEnd.acquire();