From 0fe5e08a172fa3189f51d8cf2a4564e5b3bafce5 Mon Sep 17 00:00:00 2001 From: degomme Date: Tue, 23 May 2017 21:41:34 +0200 Subject: [PATCH] remove spurious non breaking spaces, grrr --- .appveyor.yml | 2 +- circle.yml | 2 +- doc/manpage/tesh.pod | 2 +- examples/msg/app-bittorrent/peer.c | 4 ++-- examples/msg/dht-pastry/dht-pastry.c | 2 +- include/simgrid/s4u/Actor.hpp | 2 +- teshsuite/smpi/isp/umpire/CMakeLists.txt | 2 +- tools/cmake/GCCFlags.cmake | 8 ++++---- tools/cmake/MakeLib.cmake | 2 +- tools/internal/travis-sonarqube.sh | 4 ++-- tools/jenkins/Coverage.sh | 2 +- tools/jenkins/DynamicAnalysis.sh | 4 ++-- tools/jenkins/Flags.sh | 2 +- tools/jenkins/Sanitizers.sh | 2 +- tools/jenkins/build.sh | 2 +- tools/tesh/tesh.py | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 72d470e4b5..e1ae3f1c06 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -2,7 +2,7 @@ # # Build logs: https://ci.appveyor.com/project/simgrid/simgrid -# Documentation: https://www.appveyor.com/docs/ +# Documentation: https://www.appveyor.com/docs/ # https://www.appveyor.com/docs/installed-software/ os: Visual Studio 2015 diff --git a/circle.yml b/circle.yml index 3faf1433f8..253cfa2623 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,6 @@ # This is the configuration file for the https://circleci.com/ continuous integration server # -# Copyright (C) 2017. The SimGrid team. All rights reserved. +# Copyright (C) 2017. The SimGrid team. All rights reserved. # # 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. diff --git a/doc/manpage/tesh.pod b/doc/manpage/tesh.pod index 7d9130cd82..0a9ef6ce97 100755 --- a/doc/manpage/tesh.pod +++ b/doc/manpage/tesh.pod @@ -22,7 +22,7 @@ they produce the expected output and return the expected value. --setenv var=value : set a specific environment variable --cfg arg : add parameter --cfg=arg to each command line --log arg : add parameter --log=arg to each command line - --ignore-jenkins : ignore all cruft generated on SimGrid + --ignore-jenkins : ignore all cruft generated on SimGrid continuous integration servers diff --git a/examples/msg/app-bittorrent/peer.c b/examples/msg/app-bittorrent/peer.c index ee19ff211f..172199aa39 100644 --- a/examples/msg/app-bittorrent/peer.c +++ b/examples/msg/app-bittorrent/peer.c @@ -167,7 +167,7 @@ void seed_loop(peer_t peer, double deadline) } } -/** @brief Retrieves the peer list from the tracker +/** @brief Retrieves the peer list from the tracker * @param peer current peer data */ int get_peers_data(peer_t peer) @@ -263,7 +263,7 @@ void peer_free(peer_t peer) xbt_free(peer); } -/** @brief Returns if a peer has finished downloading the file +/** @brief Returns if a peer has finished downloading the file * @param bitfield peer bitfield */ int has_finished(unsigned int bitfield) diff --git a/examples/msg/dht-pastry/dht-pastry.c b/examples/msg/dht-pastry/dht-pastry.c index 12d13daf11..782b7bad49 100644 --- a/examples/msg/dht-pastry/dht-pastry.c +++ b/examples/msg/dht-pastry/dht-pastry.c @@ -280,7 +280,7 @@ static void handle_task(node_t node, msg_task_t task) { /* Join reply from all the node touched by the join */ case TASK_JOIN_LAST_REPLY: // if last node touched reply, copy its namespace set - // TODO: it works only if the two nodes are side to side (is it really the case ?) + // TODO: it works only if the two nodes are side to side (is it really the case ?) j = (task_data->sender_id < node->id) ? -1 : 0; for (i=0; inamespace_set[i] = task_data->state->namespace_set[i-j]; diff --git a/include/simgrid/s4u/Actor.hpp b/include/simgrid/s4u/Actor.hpp index bef7072932..6eabdf592c 100644 --- a/include/simgrid/s4u/Actor.hpp +++ b/include/simgrid/s4u/Actor.hpp @@ -351,7 +351,7 @@ namespace this_actor { XBT_PUBLIC(void) migrate(Host* new_host); }; -/** @} */ +/** @} */ }} // namespace simgrid::s4u diff --git a/teshsuite/smpi/isp/umpire/CMakeLists.txt b/teshsuite/smpi/isp/umpire/CMakeLists.txt index 900597ce08..b639c18c93 100644 --- a/teshsuite/smpi/isp/umpire/CMakeLists.txt +++ b/teshsuite/smpi/isp/umpire/CMakeLists.txt @@ -92,7 +92,7 @@ set(umpire_tests_deadlock_broken ) set(umpire_tests_problematic - deadlock-config # No deadlock detected by ISP unless MPI_Send blocking activated + deadlock-config # No deadlock detected by ISP unless MPI_Send blocking activated ) # problematic tests # These files are not listed on http://formalverification.cs.utah.edu/ISP_Tests/ diff --git a/tools/cmake/GCCFlags.cmake b/tools/cmake/GCCFlags.cmake index 82c286ec8f..68bbde4e35 100644 --- a/tools/cmake/GCCFlags.cmake +++ b/tools/cmake/GCCFlags.cmake @@ -35,7 +35,7 @@ if(enable_compile_warnings) set(warnCXXFLAGS "${warnCXXFLAGS} -Wno-mismatched-tags -Wno-extern-c-compat") endif() - # the one specific to C but refused by C++ + # the one specific to C but refused by C++ set(warnCFLAGS "${warnCFLAGS} -Wmissing-prototypes") if(CMAKE_Fotran_COMPILER_ID MATCHES "GCC|PGI") @@ -76,7 +76,7 @@ endif() # Configure LTO # NOTE, cmake 3.0 has a INTERPROCEDURAL_OPTIMIZATION target # property for this (http://www.cmake.org/cmake/help/v3.0/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.html) -if(enable_lto) # User wants LTO. Try if we can do that +if(enable_lto) # User wants LTO. Try if we can do that set(enable_lto OFF) if(enable_compile_optimizations AND CMAKE_COMPILER_IS_GNUCC @@ -211,8 +211,8 @@ if(NOT $ENV{LDFLAGS} STREQUAL "") endif() if(MINGW) - # http://stackoverflow.com/questions/10452262/create-64-bit-jni-under-windows - # We don't want to ship libgcc_s_seh-1.dll nor libstdc++-6.dll + # http://stackoverflow.com/questions/10452262/create-64-bit-jni-under-windows + # We don't want to ship libgcc_s_seh-1.dll nor libstdc++-6.dll set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -static-libgcc") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc -static-libstdc++") set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "${CMAKE_SHARED_LIBRARY_LINK_C_FLAGS} -static-libgcc") diff --git a/tools/cmake/MakeLib.cmake b/tools/cmake/MakeLib.cmake index d116926c75..d7c456a5fd 100644 --- a/tools/cmake/MakeLib.cmake +++ b/tools/cmake/MakeLib.cmake @@ -5,7 +5,7 @@ set(MACOSX_RPATH ON) if(APPLE) # add the current location of libsimgrid-java.dynlib as a location for libsimgrid.dynlib - # (useful when unpacking the native libraries from the jarfile) + # (useful when unpacking the native libraries from the jarfile) set(CMAKE_INSTALL_RPATH "@loader_path/.") SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) endif() diff --git a/tools/internal/travis-sonarqube.sh b/tools/internal/travis-sonarqube.sh index a4db50a5e1..65e549f996 100755 --- a/tools/internal/travis-sonarqube.sh +++ b/tools/internal/travis-sonarqube.sh @@ -6,7 +6,7 @@ # On Mac OSX or with pull requests, you don't want to run SonarQube but to exec the build command directly. -# Be verbose and fail fast +# Be verbose and fail fast set -ex # Install required software @@ -53,4 +53,4 @@ sonar-scanner -Dsonar.host.url=https://sonarqube.com -Dsonar.login=$SONAR_TOKEN | grep -v 'INFO: Parsing /home/travis/build/simgrid/simgrid/Testing/CoverageInfo' \ | grep -v 'WARN: File not analysed by Sonar, so ignoring coverage: /usr/include/' -exit $outcome \ No newline at end of file +exit $outcome diff --git a/tools/jenkins/Coverage.sh b/tools/jenkins/Coverage.sh index 1befd1815b..e6a16947aa 100755 --- a/tools/jenkins/Coverage.sh +++ b/tools/jenkins/Coverage.sh @@ -31,7 +31,7 @@ do fi done -### Cleanup previous runs +### Cleanup previous runs ! [ -z "$WORKSPACE" ] || die "No WORKSPACE" [ -d "$WORKSPACE" ] || die "WORKSPACE ($WORKSPACE) does not exist" diff --git a/tools/jenkins/DynamicAnalysis.sh b/tools/jenkins/DynamicAnalysis.sh index 3a589499d0..d286e1a2a0 100755 --- a/tools/jenkins/DynamicAnalysis.sh +++ b/tools/jenkins/DynamicAnalysis.sh @@ -30,7 +30,7 @@ do fi done -### Cleanup previous runs +### Cleanup previous runs ! [ -z "$WORKSPACE" ] || die "No WORKSPACE" [ -d "$WORKSPACE" ] || die "WORKSPACE ($WORKSPACE) does not exist" @@ -46,7 +46,7 @@ NUMPROC="$(nproc)" || NUMPROC=1 cd $WORKSPACE/build -### Proceed with the tests +### Proceed with the tests ctest -D ExperimentalStart || true cmake -Denable_documentation=OFF -Denable_lua=OFF \ diff --git a/tools/jenkins/Flags.sh b/tools/jenkins/Flags.sh index 62d76e3a0d..128fcc4cc0 100755 --- a/tools/jenkins/Flags.sh +++ b/tools/jenkins/Flags.sh @@ -34,7 +34,7 @@ onoff() { fi } -### Cleanup previous runs +### Cleanup previous runs ! [ -z "$WORKSPACE" ] || die "No WORKSPACE" [ -d "$WORKSPACE" ] || die "WORKSPACE ($WORKSPACE) does not exist" diff --git a/tools/jenkins/Sanitizers.sh b/tools/jenkins/Sanitizers.sh index 63064baee4..9d83f58589 100755 --- a/tools/jenkins/Sanitizers.sh +++ b/tools/jenkins/Sanitizers.sh @@ -55,7 +55,7 @@ do fi done -### Cleanup previous runs +### Cleanup previous runs ! [ -z "$WORKSPACE" ] || die "No WORKSPACE" [ -d "$WORKSPACE" ] || die "WORKSPACE ($WORKSPACE) does not exist" diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index 1421468644..525a9c33e5 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -47,7 +47,7 @@ onoff() { #test -e /bin/tar || die 1 "I need tar to compile. Please fix your slave." #test -e /bin/gzip || die 1 "I need gzip to compile. Please fix your slave." #test -e /usr/include/libunwind.h || die 1 "I need libunwind to compile. Please fix your slave." -#test -e /usr/include/valgrind/valgrind.h || die 1 "I need valgrind to compile. Please fix your slave." +#test -e /usr/include/valgrind/valgrind.h || die 1 "I need valgrind to compile. Please fix your slave." build_mode="$1" echo "Build mode $build_mode on $(uname -np)" >&2 diff --git a/tools/tesh/tesh.py b/tools/tesh/tesh.py index 70947d3204..7febe402c0 100755 --- a/tools/tesh/tesh.py +++ b/tools/tesh/tesh.py @@ -418,7 +418,7 @@ if __name__ == '__main__': group1.add_argument('--setenv', metavar='var=value', action='append', help='set a specific environment variable') group1.add_argument('--cfg', metavar='arg', help='add parameter --cfg=arg to each command line') group1.add_argument('--log', metavar='arg', help='add parameter --log=arg to each command line') - group1.add_argument('--ignore-jenkins', action='store_true', help='ignore all cruft generated on SimGrid continous integration servers') + group1.add_argument('--ignore-jenkins', action='store_true', help='ignore all cruft generated on SimGrid continous integration servers') group1.add_argument('--wrapper', metavar='arg', help='Run each command in the provided wrapper (eg valgrind)') group1.add_argument('--keep', action='store_true', help='Keep the obtained output when it does not match the expected one') -- 2.20.1