From 63e51e420cc4bfe5cbb54482c95f1b6d1257df03 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 12 Sep 2017 15:08:55 +0200 Subject: [PATCH] Avoid uppercase characters in package names. --- .gitignore | 4 ++-- teshsuite/java/CMakeLists.txt | 10 +++++----- .../java/{semaphoreGC => semaphoregc}/SemaphoreGC.java | 4 ++-- .../semaphoreGC.tesh => semaphoregc/semaphoregc.tesh} | 2 +- .../{sleepHostOff => sleephostoff}/SleepHostOff.java | 4 ++-- .../sleephostoff.tesh} | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) rename teshsuite/java/{semaphoreGC => semaphoregc}/SemaphoreGC.java (93%) rename teshsuite/java/{semaphoreGC/semaphoreGC.tesh => semaphoregc/semaphoregc.tesh} (86%) rename teshsuite/java/{sleepHostOff => sleephostoff}/SleepHostOff.java (95%) rename teshsuite/java/{sleepHostOff/sleepHostOff.tesh => sleephostoff/sleephostoff.tesh} (93%) diff --git a/.gitignore b/.gitignore index 175b3443cb..6cbf48a71a 100644 --- a/.gitignore +++ b/.gitignore @@ -246,8 +246,8 @@ examples/smpi/trace_simple/smpi_trace_simple examples/smpi/trace_call_location/smpi_trace_call_location testall teshsuite/datadesc_usage.out -teshsuite/java/semaphoreGC/java-semaphoreGC_compiled -teshsuite/java/sleepHostOff/java-sleepHostOff_compiled +teshsuite/java/semaphoregc/java-semaphoregc_compiled +teshsuite/java/sleephostoff/java-sleephostoff_compiled teshsuite/mc/dwarf/dwarf teshsuite/mc/dwarf-expression/dwarf-expression teshsuite/mc/random-bug/random-bug diff --git a/teshsuite/java/CMakeLists.txt b/teshsuite/java/CMakeLists.txt index 4814b20bed..de2af46938 100644 --- a/teshsuite/java/CMakeLists.txt +++ b/teshsuite/java/CMakeLists.txt @@ -1,7 +1,7 @@ -set(semaphoreGC_files SemaphoreGC) -set(sleepHostOff_files SleepHostOff) +set(semaphoregc_files SemaphoreGC) +set(sleephostoff_files SleepHostOff) -foreach(example semaphoreGC sleepHostOff) +foreach(example semaphoregc sleephostoff) foreach (filename ${${example}_files} ) set(sources "${${example}_sources}" "${CMAKE_CURRENT_SOURCE_DIR}/${example}/${filename}.java") endforeach() @@ -27,6 +27,6 @@ set(examples_src ${examples_src} ${sources} set(tesh_files ${tesh_files} PARENT_SCOPE) if(enable_java) - ADD_TESH(tesh-java-semaphoreGC --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java/semaphoreGC ${CMAKE_HOME_DIRECTORY}/teshsuite/java/semaphoreGC/semaphoreGC.tesh) - ADD_TESH(tesh-java-sleepHostOff --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java/sleepHostOff ${CMAKE_HOME_DIRECTORY}/teshsuite/java/sleepHostOff/sleepHostOff.tesh) + ADD_TESH(tesh-java-semaphoregc --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java/semaphoregc ${CMAKE_HOME_DIRECTORY}/teshsuite/java/semaphoregc/semaphoregc.tesh) + ADD_TESH(tesh-java-sleephostoff --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java/sleephostoff ${CMAKE_HOME_DIRECTORY}/teshsuite/java/sleephostoff/sleephostoff.tesh) endif() diff --git a/teshsuite/java/semaphoreGC/SemaphoreGC.java b/teshsuite/java/semaphoregc/SemaphoreGC.java similarity index 93% rename from teshsuite/java/semaphoreGC/SemaphoreGC.java rename to teshsuite/java/semaphoregc/SemaphoreGC.java index cf18ab252f..21cad25706 100644 --- a/teshsuite/java/semaphoreGC/SemaphoreGC.java +++ b/teshsuite/java/semaphoregc/SemaphoreGC.java @@ -7,7 +7,7 @@ * This was reported as bug #19893 on gforge. */ -package semaphoreGC; +package semaphoregc; import org.simgrid.msg.*; import org.simgrid.msg.Process; @@ -37,7 +37,7 @@ public class SemaphoreGC { public static void main(String[] args) throws Exception { Msg.init(args); if (args.length < 1) { - Msg.info("Usage: java -cp simgrid.jar:. semaphoreGC.SemaphoreGC "); + Msg.info("Usage: java -cp simgrid.jar:. semaphoregc.SemaphoreGC "); System.exit(1); } Msg.createEnvironment(args[0]); diff --git a/teshsuite/java/semaphoreGC/semaphoreGC.tesh b/teshsuite/java/semaphoregc/semaphoregc.tesh similarity index 86% rename from teshsuite/java/semaphoreGC/semaphoreGC.tesh rename to teshsuite/java/semaphoregc/semaphoregc.tesh index d3d9f3ef66..a321b134ad 100644 --- a/teshsuite/java/semaphoreGC/semaphoreGC.tesh +++ b/teshsuite/java/semaphoregc/semaphoregc.tesh @@ -1,6 +1,6 @@ ! timeout 15 -$ java -classpath ${classpath:=.} semaphoreGC.SemaphoreGC ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.4r]%e(%i:%P@%h)%e%m%n" +$ java -classpath ${classpath:=.} semaphoregc.SemaphoreGC ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.4r]%e(%i:%P@%h)%e%m%n" > [ 0.0000] (0:maestro@) Using regular java threads. > [ 0.0000] (1:SemCreator@Fafard) Creating 50 new Semaphores, yielding and triggering a GC after each > [ 500.0000] (1:SemCreator@Fafard) It worked, we survived. The test is passed. diff --git a/teshsuite/java/sleepHostOff/SleepHostOff.java b/teshsuite/java/sleephostoff/SleepHostOff.java similarity index 95% rename from teshsuite/java/sleepHostOff/SleepHostOff.java rename to teshsuite/java/sleephostoff/SleepHostOff.java index 78c95a5581..16ab628585 100644 --- a/teshsuite/java/sleepHostOff/SleepHostOff.java +++ b/teshsuite/java/sleephostoff/SleepHostOff.java @@ -3,7 +3,7 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -package sleepHostOff; +package sleephostoff; import org.simgrid.msg.*; import org.simgrid.msg.Process; @@ -55,7 +55,7 @@ public class SleepHostOff { Msg.init(args); if (args.length < 1) { - Msg.info("Usage: java -cp simgrid.jar:. sleepHostOff.SleepHostOff "); + Msg.info("Usage: java -cp simgrid.jar:. sleephostoff.SleepHostOff "); System.exit(1); } diff --git a/teshsuite/java/sleepHostOff/sleepHostOff.tesh b/teshsuite/java/sleephostoff/sleephostoff.tesh similarity index 93% rename from teshsuite/java/sleepHostOff/sleepHostOff.tesh rename to teshsuite/java/sleephostoff/sleephostoff.tesh index 8286614a0d..55aabb59da 100644 --- a/teshsuite/java/sleepHostOff/sleepHostOff.tesh +++ b/teshsuite/java/sleephostoff/sleephostoff.tesh @@ -1,4 +1,4 @@ -$ java -classpath ${classpath:=.} sleepHostOff.SleepHostOff ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" +$ java -classpath ${classpath:=.} sleephostoff.SleepHostOff ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" > [ 0.000000] (0:maestro@) Using regular java threads. > [ 0.000000] (1:TestRunner@Fafard) **** **** **** ***** ***** Test Sleep ***** ***** **** **** **** > [ 0.000000] (1:TestRunner@Fafard) Test sleep: Create a process on Tremblay that simply make periodic sleep, turn off Tremblay -- 2.20.1