lkml.org 
[lkml]   [2019]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH tip/core/rcu 18/21] tools/memory-model: Move from .AArch64.litmus.out to .litmus.AArch.out
    Date
    When the github scripts see ".litmus.out", they assume that there must be
    a corresponding C-language ".litmus" file. Won't they be disappointed
    when they instead see nothing, or, worse yet, the corresponding
    assembly-language litmus test? This commit therefore swaps the hardware
    tag with the "litmus" to avoid this sort of disappointment.

    This commit also adjusts the .gitignore file so as to avoid adding these
    new ".out" files to git.

    Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
    ---
    tools/memory-model/litmus-tests/.gitignore | 2 +-
    tools/memory-model/scripts/judgelitmus.sh | 2 +-
    tools/memory-model/scripts/runlitmus.sh | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/tools/memory-model/litmus-tests/.gitignore b/tools/memory-model/litmus-tests/.gitignore
    index 6e2ddc54152f..f47cb2045f13 100644
    --- a/tools/memory-model/litmus-tests/.gitignore
    +++ b/tools/memory-model/litmus-tests/.gitignore
    @@ -1 +1 @@
    -*.litmus.out
    +*.out
    diff --git a/tools/memory-model/scripts/judgelitmus.sh b/tools/memory-model/scripts/judgelitmus.sh
    index a1313f9960c3..6ecd223c0f4c 100755
    --- a/tools/memory-model/scripts/judgelitmus.sh
    +++ b/tools/memory-model/scripts/judgelitmus.sh
    @@ -37,7 +37,7 @@ then
    lkmmout=
    else
    litmusout="`echo $litmus |
    - sed -e 's/\.litmus$/.'${LKMM_HW_MAP_FILE}'.litmus/'`.out"
    + sed -e 's/\.litmus$/.litmus.'${LKMM_HW_MAP_FILE}'/'`.out"
    lkmmout=$litmus.out
    fi
    if test -f "$LKMM_DESTDIR/$litmusout" -a -r "$LKMM_DESTDIR/$litmusout"
    diff --git a/tools/memory-model/scripts/runlitmus.sh b/tools/memory-model/scripts/runlitmus.sh
    index 186944a7a528..154c95ce79da 100755
    --- a/tools/memory-model/scripts/runlitmus.sh
    +++ b/tools/memory-model/scripts/runlitmus.sh
    @@ -57,7 +57,7 @@ catfile="`echo $LKMM_HW_MAP_FILE | tr '[A-Z]' '[a-z]'`.cat"
    mapfile="Linux2${LKMM_HW_MAP_FILE}.map"
    themefile="$T/${LKMM_HW_MAP_FILE}.theme"
    herdoptions="-model $LKMM_HW_CAT_FILE"
    -hwlitmus=`echo $litmus | sed -e 's/\.litmus$/.'${LKMM_HW_MAP_FILE}'.litmus/'`
    +hwlitmus=`echo $litmus | sed -e 's/\.litmus$/.litmus.'${LKMM_HW_MAP_FILE}'/'`
    hwlitmusfile=`echo $hwlitmus | sed -e 's,^.*/,,'`

    # Don't run on litmus tests with complex synchronization
    --
    2.17.1
    \
     
     \ /
      Last update: 2019-03-27 00:43    [W:4.275 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site