From 4a42fe0647f93cfe6ef031e6789a53621b12019a Mon Sep 17 00:00:00 2001
From: Scott Jackson <scottmo@schedmd.com>
Date: Tue, 12 May 2020 14:54:57 -0600
Subject: [PATCH] Testsuite - Eliminate direct printing of SUCCESS messages
Bug 6597
---
testsuite/expect/inc3.11.7 | 6 +++---
testsuite/expect/inc3.11.8 | 8 ++++----
testsuite/expect/inc3.11.9 | 20 ++++++++++----------
testsuite/expect/test1.1 | 3 ---
testsuite/expect/test1.10 | 3 ---
testsuite/expect/test1.100 | 3 ---
testsuite/expect/test1.101 | 1 -
testsuite/expect/test1.102 | 3 ---
testsuite/expect/test1.103 | 4 +---
testsuite/expect/test1.104 | 1 -
testsuite/expect/test1.105 | 3 ---
testsuite/expect/test1.106 | 3 ---
testsuite/expect/test1.107 | 4 +---
testsuite/expect/test1.108 | 3 ---
testsuite/expect/test1.109 | 4 +---
testsuite/expect/test1.11 | 3 ---
testsuite/expect/test1.110 | 3 ---
testsuite/expect/test1.111 | 4 +---
testsuite/expect/test1.112 | 3 ---
testsuite/expect/test1.113 | 3 ---
testsuite/expect/test1.114 | 3 ---
testsuite/expect/test1.115 | 1 -
testsuite/expect/test1.12 | 1 -
testsuite/expect/test1.13 | 3 ---
testsuite/expect/test1.14 | 1 -
testsuite/expect/test1.15 | 3 ---
testsuite/expect/test1.16 | 3 ---
testsuite/expect/test1.17 | 1 -
testsuite/expect/test1.18 | 3 ---
testsuite/expect/test1.19 | 3 ---
testsuite/expect/test1.2 | 3 ---
testsuite/expect/test1.20 | 3 ---
testsuite/expect/test1.21 | 8 +-------
testsuite/expect/test1.22 | 3 ---
testsuite/expect/test1.23 | 3 ---
testsuite/expect/test1.24 | 4 ----
testsuite/expect/test1.25 | 3 ---
testsuite/expect/test1.26 | 3 ---
testsuite/expect/test1.27 | 3 ---
testsuite/expect/test1.28 | 1 -
testsuite/expect/test1.29 | 3 +--
testsuite/expect/test1.3 | 3 ---
testsuite/expect/test1.30 | 3 ---
testsuite/expect/test1.31 | 1 -
testsuite/expect/test1.32 | 1 -
testsuite/expect/test1.33 | 1 -
testsuite/expect/test1.34 | 1 -
testsuite/expect/test1.35 | 1 -
testsuite/expect/test1.36 | 3 ---
testsuite/expect/test1.37 | 3 ---
testsuite/expect/test1.38 | 1 -
testsuite/expect/test1.4 | 3 ---
testsuite/expect/test1.40 | 1 -
testsuite/expect/test1.41 | 3 ---
testsuite/expect/test1.42 | 1 -
testsuite/expect/test1.43 | 3 ---
testsuite/expect/test1.44 | 1 -
testsuite/expect/test1.45 | 1 -
testsuite/expect/test1.46 | 1 -
testsuite/expect/test1.47 | 1 -
testsuite/expect/test1.48 | 3 ---
testsuite/expect/test1.49 | 1 -
testsuite/expect/test1.5 | 3 ---
testsuite/expect/test1.50 | 3 ---
testsuite/expect/test1.51 | 1 -
testsuite/expect/test1.52 | 1 -
testsuite/expect/test1.53 | 1 -
testsuite/expect/test1.54 | 1 -
testsuite/expect/test1.55 | 1 -
testsuite/expect/test1.56 | 1 -
testsuite/expect/test1.58 | 3 ---
testsuite/expect/test1.59 | 1 -
testsuite/expect/test1.6 | 3 ---
testsuite/expect/test1.60 | 3 ---
testsuite/expect/test1.61 | 1 -
testsuite/expect/test1.62 | 3 ---
testsuite/expect/test1.63 | 1 -
testsuite/expect/test1.64 | 3 ---
testsuite/expect/test1.65 | 3 ---
testsuite/expect/test1.66 | 1 -
testsuite/expect/test1.67 | 1 -
testsuite/expect/test1.68 | 1 -
testsuite/expect/test1.69 | 1 -
testsuite/expect/test1.7 | 3 ---
testsuite/expect/test1.70 | 1 -
testsuite/expect/test1.71 | 1 -
testsuite/expect/test1.72 | 3 ---
testsuite/expect/test1.73 | 1 -
testsuite/expect/test1.74 | 4 +---
testsuite/expect/test1.75 | 1 -
testsuite/expect/test1.76 | 1 -
testsuite/expect/test1.77 | 3 ---
testsuite/expect/test1.8 | 1 -
testsuite/expect/test1.80 | 3 ---
testsuite/expect/test1.81 | 3 ---
testsuite/expect/test1.82 | 3 ---
testsuite/expect/test1.83 | 3 ---
testsuite/expect/test1.84 | 3 ---
testsuite/expect/test1.85 | 2 --
testsuite/expect/test1.86 | 3 ---
testsuite/expect/test1.87 | 3 ---
testsuite/expect/test1.88 | 1 -
testsuite/expect/test1.89 | 1 -
testsuite/expect/test1.9 | 3 ---
testsuite/expect/test1.90 | 1 -
testsuite/expect/test1.91 | 1 -
testsuite/expect/test1.92 | 4 +---
testsuite/expect/test1.93 | 3 ---
testsuite/expect/test1.94 | 1 -
testsuite/expect/test1.95 | 1 -
testsuite/expect/test1.96 | 1 -
testsuite/expect/test1.97 | 1 -
testsuite/expect/test1.99 | 1 -
testsuite/expect/test10.1 | 3 ---
testsuite/expect/test10.10 | 3 ---
testsuite/expect/test10.11 | 3 ---
testsuite/expect/test10.2 | 3 ---
testsuite/expect/test10.3 | 3 ---
testsuite/expect/test10.4 | 3 ---
testsuite/expect/test10.7 | 3 ---
testsuite/expect/test10.8 | 3 ---
testsuite/expect/test10.9 | 3 ---
testsuite/expect/test12.1 | 3 ---
testsuite/expect/test12.2 | 11 +++++------
testsuite/expect/test12.4 | 3 ---
testsuite/expect/test12.5 | 3 ---
testsuite/expect/test12.6 | 1 -
testsuite/expect/test12.7 | 6 ++++--
testsuite/expect/test12.8 | 1 -
testsuite/expect/test12.9 | 1 -
testsuite/expect/test13.1 | 3 ---
testsuite/expect/test14.1 | 3 ---
testsuite/expect/test14.10 | 1 -
testsuite/expect/test14.2 | 3 ---
testsuite/expect/test14.3 | 3 ---
testsuite/expect/test14.4 | 1 -
testsuite/expect/test14.5 | 1 -
testsuite/expect/test14.6 | 1 -
testsuite/expect/test14.7 | 1 -
testsuite/expect/test14.8 | 1 -
testsuite/expect/test14.9 | 1 -
testsuite/expect/test15.1 | 3 ---
testsuite/expect/test15.10 | 3 ---
testsuite/expect/test15.11 | 3 ---
testsuite/expect/test15.12 | 3 ---
testsuite/expect/test15.13 | 3 ---
testsuite/expect/test15.14 | 1 -
testsuite/expect/test15.15 | 3 ---
testsuite/expect/test15.16 | 3 ---
testsuite/expect/test15.18 | 3 ---
testsuite/expect/test15.19 | 6 ------
testsuite/expect/test15.2 | 3 ---
testsuite/expect/test15.20 | 3 ---
testsuite/expect/test15.21 | 4 ----
testsuite/expect/test15.22 | 3 ---
testsuite/expect/test15.24 | 1 -
testsuite/expect/test15.25 | 1 -
testsuite/expect/test15.26 | 3 ---
testsuite/expect/test15.27 | 3 ---
testsuite/expect/test15.3 | 3 ---
testsuite/expect/test15.30 | 3 ---
testsuite/expect/test15.31 | 4 +---
testsuite/expect/test15.32 | 1 -
testsuite/expect/test15.33 | 3 ---
testsuite/expect/test15.34 | 3 ---
testsuite/expect/test15.35 | 4 +---
testsuite/expect/test15.36 | 3 ---
testsuite/expect/test15.37 | 3 ---
testsuite/expect/test15.38 | 3 ---
testsuite/expect/test15.39 | 3 ---
testsuite/expect/test15.4 | 3 ---
testsuite/expect/test15.5 | 1 -
testsuite/expect/test15.6 | 3 ---
testsuite/expect/test15.7 | 3 ---
testsuite/expect/test15.8 | 3 ---
testsuite/expect/test15.9 | 3 ---
testsuite/expect/test16.1 | 3 ---
testsuite/expect/test16.2 | 3 ---
testsuite/expect/test16.3 | 3 ---
testsuite/expect/test16.4 | 1 -
testsuite/expect/test17.1 | 3 ---
testsuite/expect/test17.10 | 1 -
testsuite/expect/test17.11 | 1 -
testsuite/expect/test17.12 | 1 -
testsuite/expect/test17.13 | 1 -
testsuite/expect/test17.14 | 1 -
testsuite/expect/test17.15 | 4 +---
testsuite/expect/test17.16 | 1 -
testsuite/expect/test17.17 | 1 -
testsuite/expect/test17.18 | 1 -
testsuite/expect/test17.19 | 1 -
testsuite/expect/test17.2 | 3 ---
testsuite/expect/test17.20 | 1 -
testsuite/expect/test17.21 | 1 -
testsuite/expect/test17.22 | 3 ---
testsuite/expect/test17.23 | 3 ---
testsuite/expect/test17.24 | 1 -
testsuite/expect/test17.25 | 1 -
testsuite/expect/test17.26 | 1 -
testsuite/expect/test17.27 | 1 -
testsuite/expect/test17.28 | 1 -
testsuite/expect/test17.29 | 1 -
testsuite/expect/test17.3 | 3 ---
testsuite/expect/test17.31 | 1 -
testsuite/expect/test17.32 | 1 -
testsuite/expect/test17.33 | 1 -
testsuite/expect/test17.34 | 1 -
testsuite/expect/test17.35 | 1 -
testsuite/expect/test17.36 | 1 -
testsuite/expect/test17.38 | 1 -
testsuite/expect/test17.39 | 3 ---
testsuite/expect/test17.4 | 1 -
testsuite/expect/test17.40 | 1 -
testsuite/expect/test17.41 | 1 -
testsuite/expect/test17.42 | 1 -
testsuite/expect/test17.43 | 1 -
testsuite/expect/test17.44 | 1 -
testsuite/expect/test17.45 | 1 -
testsuite/expect/test17.5 | 1 -
testsuite/expect/test17.51 | 1 -
testsuite/expect/test17.52 | 1 -
testsuite/expect/test17.53 | 1 -
testsuite/expect/test17.54 | 1 -
testsuite/expect/test17.55 | 1 -
testsuite/expect/test17.56 | 1 -
testsuite/expect/test17.57 | 1 -
testsuite/expect/test17.58 | 1 -
testsuite/expect/test17.59 | 1 -
testsuite/expect/test17.6 | 1 -
testsuite/expect/test17.60 | 1 -
testsuite/expect/test17.61 | 1 -
testsuite/expect/test17.62 | 1 -
testsuite/expect/test17.63 | 1 -
testsuite/expect/test17.64 | 1 -
testsuite/expect/test17.8 | 1 -
testsuite/expect/test17.9 | 1 -
testsuite/expect/test19.1 | 3 ---
testsuite/expect/test19.2 | 3 ---
testsuite/expect/test19.3 | 1 -
testsuite/expect/test19.4 | 1 -
testsuite/expect/test19.5 | 1 -
testsuite/expect/test19.6 | 1 -
testsuite/expect/test19.7 | 1 -
testsuite/expect/test19.8 | 1 -
testsuite/expect/test19.9 | 1 -
testsuite/expect/test2.1 | 3 ---
testsuite/expect/test2.10 | 3 ---
testsuite/expect/test2.11 | 1 -
testsuite/expect/test2.12 | 3 ---
testsuite/expect/test2.13 | 1 -
testsuite/expect/test2.14 | 1 -
testsuite/expect/test2.15 | 1 -
testsuite/expect/test2.16 | 3 ---
testsuite/expect/test2.17 | 4 ----
testsuite/expect/test2.18 | 3 ---
testsuite/expect/test2.19 | 3 ---
testsuite/expect/test2.2 | 3 ---
testsuite/expect/test2.20 | 3 ---
testsuite/expect/test2.21 | 1 -
testsuite/expect/test2.22 | 1 -
testsuite/expect/test2.23 | 1 -
testsuite/expect/test2.24 | 1 -
testsuite/expect/test2.25 | 3 ---
testsuite/expect/test2.26 | 1 -
testsuite/expect/test2.3 | 3 ---
testsuite/expect/test2.4 | 3 ---
testsuite/expect/test2.5 | 3 ---
testsuite/expect/test2.6 | 3 ---
testsuite/expect/test2.7 | 1 -
testsuite/expect/test2.8 | 3 ---
testsuite/expect/test2.9 | 3 ---
testsuite/expect/test20.1 | 1 -
testsuite/expect/test20.10 | 3 ---
testsuite/expect/test20.11 | 1 -
testsuite/expect/test20.12 | 1 -
testsuite/expect/test20.13 | 1 -
testsuite/expect/test20.2 | 1 -
testsuite/expect/test20.3 | 1 -
testsuite/expect/test20.4 | 3 ---
testsuite/expect/test20.5 | 3 ---
testsuite/expect/test20.6 | 1 -
testsuite/expect/test20.7 | 1 -
testsuite/expect/test20.8 | 1 -
testsuite/expect/test20.9 | 1 -
testsuite/expect/test21.1 | 3 ---
testsuite/expect/test21.11 | 3 ---
testsuite/expect/test21.19 | 4 +---
testsuite/expect/test21.2 | 3 ---
testsuite/expect/test21.29 | 4 +---
testsuite/expect/test21.3 | 3 ---
testsuite/expect/test21.31 | 4 +---
testsuite/expect/test21.32 | 4 +---
testsuite/expect/test21.33 | 4 +---
testsuite/expect/test21.36 | 4 +---
testsuite/expect/test21.37 | 3 ---
testsuite/expect/test21.4 | 3 ---
testsuite/expect/test22.1 | 4 +---
testsuite/expect/test22.2 | 3 ---
testsuite/expect/test23.1 | 5 -----
testsuite/expect/test23.2 | 1 -
testsuite/expect/test24.1 | 1 -
testsuite/expect/test24.2 | 8 ++------
testsuite/expect/test24.3 | 1 -
testsuite/expect/test24.4 | 1 -
testsuite/expect/test25.1 | 1 -
testsuite/expect/test27.1 | 3 ---
testsuite/expect/test27.2 | 3 ---
testsuite/expect/test27.3 | 3 ---
testsuite/expect/test27.4 | 3 ---
testsuite/expect/test27.5 | 3 ---
testsuite/expect/test28.1 | 1 -
testsuite/expect/test28.10 | 1 -
testsuite/expect/test28.12 | 1 -
testsuite/expect/test28.13 | 1 -
testsuite/expect/test28.2 | 1 -
testsuite/expect/test28.3 | 1 -
testsuite/expect/test28.4 | 1 -
testsuite/expect/test28.5 | 1 -
testsuite/expect/test28.6 | 1 -
testsuite/expect/test28.7 | 1 -
testsuite/expect/test28.8 | 1 -
testsuite/expect/test28.9 | 1 -
testsuite/expect/test29.1 | 3 ---
testsuite/expect/test29.2 | 3 ---
testsuite/expect/test29.3 | 1 -
testsuite/expect/test29.4 | 1 -
testsuite/expect/test29.5 | 1 -
testsuite/expect/test29.6 | 1 -
testsuite/expect/test29.7 | 1 -
testsuite/expect/test29.8 | 1 -
testsuite/expect/test3.1 | 1 -
testsuite/expect/test3.10 | 3 ---
testsuite/expect/test3.11 | 1 -
testsuite/expect/test3.12 | 3 ---
testsuite/expect/test3.13 | 3 ---
testsuite/expect/test3.14 | 4 +---
testsuite/expect/test3.15 | 8 +-------
testsuite/expect/test3.16 | 3 ---
testsuite/expect/test3.17 | 1 -
testsuite/expect/test3.18 | 3 ---
testsuite/expect/test3.2 | 3 ---
testsuite/expect/test3.3 | 3 ---
testsuite/expect/test3.4 | 3 ---
testsuite/expect/test3.5 | 3 ---
testsuite/expect/test3.6 | 3 ---
testsuite/expect/test3.7 | 1 -
testsuite/expect/test3.8 | 1 -
testsuite/expect/test3.9 | 3 ---
testsuite/expect/test31.1 | 1 -
testsuite/expect/test31.2 | 1 -
testsuite/expect/test32.1 | 3 ---
testsuite/expect/test32.10 | 1 -
testsuite/expect/test32.11 | 1 -
testsuite/expect/test32.12 | 1 -
testsuite/expect/test32.2 | 3 ---
testsuite/expect/test32.3 | 3 ---
testsuite/expect/test32.4 | 1 -
testsuite/expect/test32.5 | 1 -
testsuite/expect/test32.6 | 1 -
testsuite/expect/test32.7 | 1 -
testsuite/expect/test32.8 | 1 -
testsuite/expect/test32.9 | 1 -
testsuite/expect/test33.1 | 1 -
testsuite/expect/test34.1 | 1 -
testsuite/expect/test34.2 | 1 -
testsuite/expect/test35.1 | 1 -
testsuite/expect/test35.2 | 1 -
testsuite/expect/test35.3 | 1 -
testsuite/expect/test35.4 | 1 -
testsuite/expect/test35.5 | 3 ---
testsuite/expect/test35.6 | 1 -
testsuite/expect/test36.1 | 4 +---
testsuite/expect/test36.2 | 1 -
testsuite/expect/test36.3 | 1 -
testsuite/expect/test36.4 | 1 -
testsuite/expect/test38.10 | 1 -
testsuite/expect/test38.11 | 1 -
testsuite/expect/test38.12 | 1 -
testsuite/expect/test38.14 | 1 -
testsuite/expect/test38.15 | 1 -
testsuite/expect/test38.16 | 1 -
testsuite/expect/test38.7 | 1 -
testsuite/expect/test38.8 | 1 -
testsuite/expect/test38.9 | 1 -
testsuite/expect/test39.1 | 1 -
testsuite/expect/test39.10 | 1 -
testsuite/expect/test39.11 | 1 -
testsuite/expect/test39.12 | 1 -
testsuite/expect/test39.13 | 1 -
testsuite/expect/test39.14 | 1 -
testsuite/expect/test39.15 | 1 -
testsuite/expect/test39.16 | 1 -
testsuite/expect/test39.17 | 1 -
testsuite/expect/test39.18 | 4 +---
testsuite/expect/test39.19 | 1 -
testsuite/expect/test39.2 | 1 -
testsuite/expect/test39.20 | 1 -
testsuite/expect/test39.21 | 1 -
testsuite/expect/test39.22 | 1 -
testsuite/expect/test39.23 | 1 -
testsuite/expect/test39.3 | 1 -
testsuite/expect/test39.4 | 3 ---
testsuite/expect/test39.5 | 1 -
testsuite/expect/test39.6 | 1 -
testsuite/expect/test39.7 | 1 -
testsuite/expect/test39.8 | 1 -
testsuite/expect/test39.9 | 1 -
testsuite/expect/test4.1 | 3 ---
testsuite/expect/test4.10 | 3 ---
testsuite/expect/test4.11 | 3 ---
testsuite/expect/test4.12 | 6 +-----
testsuite/expect/test4.13 | 4 +---
testsuite/expect/test4.14 | 4 ----
testsuite/expect/test4.2 | 3 ---
testsuite/expect/test4.3 | 3 ---
testsuite/expect/test4.4 | 3 ---
testsuite/expect/test4.5 | 1 -
testsuite/expect/test4.6 | 3 ---
testsuite/expect/test4.7 | 3 ---
testsuite/expect/test4.8 | 3 ---
testsuite/expect/test4.9 | 3 ---
testsuite/expect/test40.1 | 3 ---
testsuite/expect/test40.2 | 1 -
testsuite/expect/test40.3 | 1 -
testsuite/expect/test40.4 | 1 -
testsuite/expect/test40.5 | 1 -
testsuite/expect/test40.6 | 1 -
testsuite/expect/test40.8 | 1 -
testsuite/expect/test5.1 | 3 ---
testsuite/expect/test5.10 | 1 -
testsuite/expect/test5.11 | 8 ++------
testsuite/expect/test5.2 | 3 ---
testsuite/expect/test5.3 | 3 ---
testsuite/expect/test5.4 | 3 ---
testsuite/expect/test5.5 | 3 ---
testsuite/expect/test5.6 | 1 -
testsuite/expect/test5.7 | 3 ---
testsuite/expect/test5.8 | 3 ---
testsuite/expect/test5.9 | 1 -
testsuite/expect/test6.1 | 3 ---
testsuite/expect/test6.10 | 1 -
testsuite/expect/test6.11 | 1 -
testsuite/expect/test6.12 | 1 -
testsuite/expect/test6.13 | 1 -
testsuite/expect/test6.14 | 3 ---
testsuite/expect/test6.16 | 1 -
testsuite/expect/test6.17 | 4 +---
testsuite/expect/test6.2 | 3 ---
testsuite/expect/test6.3 | 1 -
testsuite/expect/test6.4 | 4 +---
testsuite/expect/test6.5 | 3 ---
testsuite/expect/test6.6 | 3 ---
testsuite/expect/test6.7 | 1 -
testsuite/expect/test6.8 | 4 +---
testsuite/expect/test6.9 | 1 -
testsuite/expect/test7.1 | 1 -
testsuite/expect/test7.10 | 1 -
testsuite/expect/test7.12 | 1 -
testsuite/expect/test7.13 | 1 -
testsuite/expect/test7.14 | 1 -
testsuite/expect/test7.15 | 1 -
testsuite/expect/test7.16 | 3 ---
testsuite/expect/test7.17 | 1 -
testsuite/expect/test7.18 | 1 -
testsuite/expect/test7.19 | 2 --
testsuite/expect/test7.2 | 4 +---
testsuite/expect/test7.3 | 1 -
testsuite/expect/test7.4 | 1 -
testsuite/expect/test7.5 | 1 -
testsuite/expect/test7.6 | 1 -
testsuite/expect/test7.7 | 1 -
testsuite/expect/test7.9 | 4 +---
testsuite/expect/test9.1 | 1 -
testsuite/expect/test9.2 | 1 -
testsuite/expect/test9.3 | 1 -
testsuite/expect/test9.4 | 4 +---
testsuite/expect/test9.5 | 4 +---
testsuite/expect/test9.6 | 1 -
testsuite/expect/test9.7 | 3 ---
testsuite/expect/test9.8 | 1 -
testsuite/expect/test9.9 | 5 -----
481 files changed, 61 insertions(+), 965 deletions(-)
diff --git a/testsuite/expect/inc3.11.7 b/testsuite/expect/inc3.11.7
index a981b8f9d34..694ba53d942 100644
--- a/testsuite/expect/inc3.11.7
+++ b/testsuite/expect/inc3.11.7
@@ -198,7 +198,7 @@ proc inc3_11_7 {} {
exp_continue
}
-re "JobState=PENDING" {
- send_user "\n\033\[32mSUCCESS: Job $job_id is PENDING as expected (Within: inc3.11.7)\033\[m\n"
+ log_info "Job $job_id is PENDING as expected (Within: inc3.11.7)"
exp_continue
}
-re "JobState=RUNNING" {
@@ -250,7 +250,7 @@ proc inc3_11_7 {} {
exp_continue
}
-re "JobState=PENDING" {
- send_user "\n\033\[32mSUCCESS: Job $job_id is PENDING as expected (Within: inc3.11.7)\033\[m\n"
+ log_info "ob $job_id is PENDING as expected (Within: inc3.11.7)"
exp_continue
}
-re "JobState=RUNNING" {
@@ -291,7 +291,7 @@ proc inc3_11_7 {} {
exp_continue
}
-re "JobState=RUNNING" {
- send_user "\n\033\[32mSUCCESS: Job $job_id is RUNNING as expected (Within: inc3.11.7)\033\[m\n"
+ log_info "Job $job_id is RUNNING as expected (Within: inc3.11.7)"
exp_continue
}
timeout {
diff --git a/testsuite/expect/inc3.11.8 b/testsuite/expect/inc3.11.8
index 9e28760b0a3..2e00293c1d0 100644
--- a/testsuite/expect/inc3.11.8
+++ b/testsuite/expect/inc3.11.8
@@ -141,7 +141,7 @@ proc inc3_11_8 {} {
cancel_job $job_id
exit $ret_code
}
- send_user "\n\033\[32mSUCCESS: reservation was created as expected (Within: inc3.11.8)\033\[m\n"
+ log_info "Reservation was created as expected (Within: inc3.11.8)"
# Delete the reservation
set ret_code [delete_res $res_name]
@@ -154,7 +154,7 @@ proc inc3_11_8 {} {
# Make the reservation using more cores then free in a node
set ret_code [create_res "StartTime=now Duration=60 Nodes=$host_name CoreCnt=$core_res_num User=$user_name" 1]
if {$ret_code != 0} {
- send_user "\n\033\[32mSUCCESS: Reservation can not be created as expected (Within: inc3.11.8)\033\[m\n"
+ log_info "Reservation can not be created as expected (Within: inc3.11.8)"
} else {
send_user "\n\033\[31mFAILURE: reservation was created when it should have not (Within: inc3.11.8)\033\[m\n"
set exit_code 1
@@ -170,7 +170,7 @@ proc inc3_11_8 {} {
send_user "\n\033\[31mFAILURE: Reservation can not be created when it should (Within: inc3.11.8)\033\[m\n"
set exit_code 1
} else {
- send_user "\n\033\[32mSUCCESS: Reservation can be created as expected (Within: inc3.11.8)\033\[m\n"
+ log_info "Reservation can be created as expected (Within: inc3.11.8)"
# Delete the reservation
set ret_code [delete_res $res_name]
}
@@ -178,7 +178,7 @@ proc inc3_11_8 {} {
# Make the reservation using more cores than free at reservation start time
set ret_code [create_res "StartTime=now+300 Duration=60 Nodes=$host_name CoreCnt=$core_res_num User=$user_name" 1]
if {$ret_code != 0} {
- send_user "\n\033\[32mSUCCESS: Reservation can not be created as expected (Within 3.11.8)\033\[m\n"
+ log_info "Reservation can not be created as expected (Within 3.11.8)"
} else {
send_user "\n\033\[31mFAILURE: Reservation can be created when it should not (Within: inc3.11.8)\033\[m\n"
set exit_code 1
diff --git a/testsuite/expect/inc3.11.9 b/testsuite/expect/inc3.11.9
index ae2947e319c..cef01feef8d 100644
--- a/testsuite/expect/inc3.11.9
+++ b/testsuite/expect/inc3.11.9
@@ -138,7 +138,7 @@ proc inc3_11_9 {} {
exit 1
}
- send_user "\n\033\[32mSUCCESS: reservation was created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation was created as expected (Within: inc3.11.9)"
# Delete the reservation
set ret_code [delete_res $res_name]
@@ -151,7 +151,7 @@ proc inc3_11_9 {} {
# Make the reservation using more cores then free in a node
set ret_code [create_res "StartTime=now Duration=60 Nodes=$def_node_name\[$min_node_inx\-$max_node_inx\] CoreCnt=1,1,1,1,$core_res_num User=$user_name" 1]
if {$ret_code != 0} {
- send_user "\n\033\[32mSUCCESS: Reservation can not be created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation can not be created as expected (Within: inc3.11.9)"
} else {
send_user "\n\033\[31mFAILURE: reservation was created when it should have not (Within: inc3.11.9)\033\[m\n"
set exit_code 1
@@ -171,7 +171,7 @@ proc inc3_11_9 {} {
send_user "\n\033\[31mFAILURE: Reservation can not be created when it should (Within: inc3.11.9)\033\[m\n"
set exit_code 1
} else {
- send_user "\n\033\[32mSUCCESS: Reservation can be created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation can be created as expected (Within: inc3.11.9)"
# Delete the reservation
set ret_code [delete_res $res_name]
if {$ret_code != 0} {
@@ -183,7 +183,7 @@ proc inc3_11_9 {} {
# Make the reservation using more cores than free at reservation start time
set ret_code [create_res "StartTime=now+300 Duration=60 Nodes=$def_node_name\[$min_node_inx\-$max_node_inx\] CoreCnt=1,1,1,1,$core_res_num User=$user_name" 1]
if {$ret_code != 0} {
- send_user "\n\033\[32mSUCCESS: Reservation can not be created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation can not be created as expected (Within: inc3.11.9)"
} else {
send_user "\n\033\[31mFAILURE: Reservation can be created when it should not (Within: inc3.11.9)\033\[m\n"
set exit_code 1
@@ -204,7 +204,7 @@ proc inc3_11_9 {} {
exit $ret_code
}
- send_user "\n\033\[32mSUCCESS: reservation was created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation was created as expected (Within: inc3.11.9)"
if {$core_res_num < 2} {
@@ -225,7 +225,7 @@ proc inc3_11_9 {} {
exit 1
}
- send_user "\n\033\[32mSUCCESS: reservation was not created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation was not created as expected (Within: inc3.11.9)"
# Now creating a reservation using first 5 nodes and just 1 core per node
set ret_code [create_res "StartTime=now Duration=60 Nodes=$def_node_name\[$min_node_inx\-$max_node_inx\] CoreCnt=1,1,1,1,1 User=$user_name" 1]
@@ -235,7 +235,7 @@ proc inc3_11_9 {} {
exit 1
}
- send_user "\n\033\[32mSUCCESS: reservation was created as expected (Within: inc3.11.9)\033\[m\n"
+ log_info "Reservation was created as expected (Within: inc3.11.9)"
# Submit a batch job: a job using cores available in first 5 nodes
set core_res_num [ expr $cores_per_node / 2 ]
@@ -669,7 +669,7 @@ proc inc3_11_9 {} {
cancel_job $job_id
exit $ret_code
}
- send_user "\nSUCCESS: Reservation can be created as expected (Within 3.11.9)\n"
+ log_info "Reservation can be created as expected (Within 3.11.9)"
set exp_node_cnt [expr {$max_node_inx-$min_node_inx+1}]
set exp_core_cnt [expr {8+$cores_per_node}]
@@ -739,7 +739,7 @@ proc inc3_11_9 {} {
set exit_code 1
}
if {$exit_code == 0} {
- send_user "\nSUCCESS: Reservation has correct nodes, CoreCnt, and CoreIDs.\n"
+ log_info "Reservation has correct nodes, CoreCnt, and CoreIDs."
}
cancel_job $job_id
@@ -812,5 +812,5 @@ proc inc3_11_9 {} {
delete_res $res_name
exit 1
}
- send_user "\nSUCCESS: Reservation can not be created as expected (Within 3.11.9)\n"
+ log_info "Reservation can not be created as expected (Within 3.11.9)"
}
diff --git a/testsuite/expect/test1.1 b/testsuite/expect/test1.1
index 877847e3ca2..0c6fcb45cec 100755
--- a/testsuite/expect/test1.1
+++ b/testsuite/expect/test1.1
@@ -87,7 +87,4 @@ if {[string compare $login_grp_info $job_grp_info] != 0} {
send_user "\nFAILURE: Login and slurm user info mismatch\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.10 b/testsuite/expect/test1.10
index 43f918edfd9..20f65381e59 100755
--- a/testsuite/expect/test1.10
+++ b/testsuite/expect/test1.10
@@ -67,7 +67,4 @@ if {$debug_get != $debug_set} {
send_user "\nFAILURE: Did not log at proper level ($debug_get != $debug_set)\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.100 b/testsuite/expect/test1.100
index 70fffefd905..d852aa897bd 100755
--- a/testsuite/expect/test1.100
+++ b/testsuite/expect/test1.100
@@ -186,7 +186,4 @@ if {[string compare $tested_layout $expected_layout]} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.101 b/testsuite/expect/test1.101
index 59f0ade61d5..961bf5e5967 100755
--- a/testsuite/expect/test1.101
+++ b/testsuite/expect/test1.101
@@ -143,6 +143,5 @@ if {$exec_cnt != $node_cnt} {
if {$exit_code == 0} {
exec rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.102 b/testsuite/expect/test1.102
index 7f04c50472b..fbf59c290b1 100755
--- a/testsuite/expect/test1.102
+++ b/testsuite/expect/test1.102
@@ -65,7 +65,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.103 b/testsuite/expect/test1.103
index 57f2c9f68dc..e42a33b3ea4 100755
--- a/testsuite/expect/test1.103
+++ b/testsuite/expect/test1.103
@@ -43,9 +43,7 @@ print_header $test_id
proc endit { } {
global exit_code
reconfigure
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.104 b/testsuite/expect/test1.104
index bd80ae8e176..87972cd1048 100755
--- a/testsuite/expect/test1.104
+++ b/testsuite/expect/test1.104
@@ -279,6 +279,5 @@ if {$found != 0} {
if {$exit_code == 0} {
exec $bin_rm $test_srun $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.105 b/testsuite/expect/test1.105
index f8f3a9a0e23..b50ddff2047 100755
--- a/testsuite/expect/test1.105
+++ b/testsuite/expect/test1.105
@@ -92,7 +92,4 @@ if {$job_id == 0} {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.106 b/testsuite/expect/test1.106
index 0247345f90f..1c5edb56458 100755
--- a/testsuite/expect/test1.106
+++ b/testsuite/expect/test1.106
@@ -72,7 +72,4 @@ if {$time_error == 0} {
send_user "\nTime limit error expected, no worries\n"
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.107 b/testsuite/expect/test1.107
index ec2e5636bcb..0e312163cde 100755
--- a/testsuite/expect/test1.107
+++ b/testsuite/expect/test1.107
@@ -44,9 +44,7 @@ print_header $test_id
proc endit { } {
global exit_code
reconfigure
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.108 b/testsuite/expect/test1.108
index 2f8c06e3110..7367aab6861 100755
--- a/testsuite/expect/test1.108
+++ b/testsuite/expect/test1.108
@@ -70,7 +70,4 @@ if {$job_id != 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.109 b/testsuite/expect/test1.109
index e157b5deec5..fbd442bb7f3 100755
--- a/testsuite/expect/test1.109
+++ b/testsuite/expect/test1.109
@@ -72,9 +72,7 @@ if {$invalid_tl == 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE: job not with DEADLINE status.\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.11 b/testsuite/expect/test1.11
index 9f9a0c1c34f..04cb7f26e9f 100755
--- a/testsuite/expect/test1.11
+++ b/testsuite/expect/test1.11
@@ -119,7 +119,4 @@ if {[ string compare $short1 $short2 ] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.110 b/testsuite/expect/test1.110
index b346d094596..f70145fe94d 100755
--- a/testsuite/expect/test1.110
+++ b/testsuite/expect/test1.110
@@ -81,7 +81,4 @@ if {[wait_for_job $job_id DONE] != 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.111 b/testsuite/expect/test1.111
index 5fbe24511d6..07b6e69d067 100755
--- a/testsuite/expect/test1.111
+++ b/testsuite/expect/test1.111
@@ -43,9 +43,7 @@ print_header $test_id
proc endit { } {
global exit_code
reconfigure
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.112 b/testsuite/expect/test1.112
index 3035410f62b..3385c0a7d55 100755
--- a/testsuite/expect/test1.112
+++ b/testsuite/expect/test1.112
@@ -94,7 +94,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.113 b/testsuite/expect/test1.113
index 9acb8a47643..8d6d45199eb 100755
--- a/testsuite/expect/test1.113
+++ b/testsuite/expect/test1.113
@@ -99,7 +99,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.114 b/testsuite/expect/test1.114
index f17ba612e12..4e4c3a9a4c4 100755
--- a/testsuite/expect/test1.114
+++ b/testsuite/expect/test1.114
@@ -131,7 +131,4 @@ for {set inx 2} {$inx < $max_task_cnt} {incr inx 2} {
sleep 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.115 b/testsuite/expect/test1.115
index 5ef0e83760a..cd2a4bfe4cd 100755
--- a/testsuite/expect/test1.115
+++ b/testsuite/expect/test1.115
@@ -73,6 +73,5 @@ print_time
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS: No error reported\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.12 b/testsuite/expect/test1.12
index 50d1d07e712..8e89a91833e 100755
--- a/testsuite/expect/test1.12
+++ b/testsuite/expect/test1.12
@@ -79,6 +79,5 @@ if {$ckpt_out == -1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.13 b/testsuite/expect/test1.13
index 4559d823593..807841fbea3 100755
--- a/testsuite/expect/test1.13
+++ b/testsuite/expect/test1.13
@@ -96,7 +96,4 @@ if {$matches != 1} {
send_user "\nFAILURE: Immediate initiation option failure\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.14 b/testsuite/expect/test1.14
index a8743dc9262..709fb5708ac 100755
--- a/testsuite/expect/test1.14
+++ b/testsuite/expect/test1.14
@@ -231,6 +231,5 @@ if { $matches != 1 } {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_in2 $file_out $file_out2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.15 b/testsuite/expect/test1.15
index b88ac843f11..845a275e83d 100755
--- a/testsuite/expect/test1.15
+++ b/testsuite/expect/test1.15
@@ -68,7 +68,4 @@ if {$matches != 2} {
send_user "\nFAILURE: problem with srun wait option matches was $matches\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.16 b/testsuite/expect/test1.16
index 82b3d3a43ed..b5a616570a1 100755
--- a/testsuite/expect/test1.16
+++ b/testsuite/expect/test1.16
@@ -80,7 +80,4 @@ if {$matches != 1} {
exec $bin_rm -f $scratch_file
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.17 b/testsuite/expect/test1.17
index 50e2932f248..57603e48f69 100755
--- a/testsuite/expect/test1.17
+++ b/testsuite/expect/test1.17
@@ -207,6 +207,5 @@ if {$got_sleep_err != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.18 b/testsuite/expect/test1.18
index a1a502fa6ba..d49974d808c 100755
--- a/testsuite/expect/test1.18
+++ b/testsuite/expect/test1.18
@@ -105,8 +105,5 @@ if {[string compare $licenses ""] != 0} {
# Run a job attempting to get a legitimate license name
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.19 b/testsuite/expect/test1.19
index 7991f463c9d..4e8c7ad48a8 100755
--- a/testsuite/expect/test1.19
+++ b/testsuite/expect/test1.19
@@ -409,7 +409,4 @@ if {$file_cnt != 2} {
#
# Post-processing
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.2 b/testsuite/expect/test1.2
index f94f366dbe7..6e022e93577 100755
--- a/testsuite/expect/test1.2
+++ b/testsuite/expect/test1.2
@@ -67,7 +67,4 @@ if {$task_cnt != $tasks} {
send_user "$task_cnt != $tasks\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.20 b/testsuite/expect/test1.20
index 0cda097c7d3..24c206f43d3 100755
--- a/testsuite/expect/test1.20
+++ b/testsuite/expect/test1.20
@@ -95,7 +95,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.21 b/testsuite/expect/test1.21
index 4cd77d41f35..7ef9bc2dc27 100755
--- a/testsuite/expect/test1.21
+++ b/testsuite/expect/test1.21
@@ -83,10 +83,7 @@ if {$matches != 1} {
}
if {[test_front_end]} {
- send_user "\nWARNING: Additional portions of this test are incompatible with front-end systems\n"
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- }
+ send_user "\nWARNING: Additional portions of this test are incompatible with front-end systems\n"
exit $exit_code
}
@@ -129,7 +126,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.22 b/testsuite/expect/test1.22
index c3666dbd342..1184207fd80 100755
--- a/testsuite/expect/test1.22
+++ b/testsuite/expect/test1.22
@@ -108,7 +108,4 @@ if {[string compare $host_0 ""] == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.23 b/testsuite/expect/test1.23
index 07c179f8058..3e800df017f 100755
--- a/testsuite/expect/test1.23
+++ b/testsuite/expect/test1.23
@@ -250,7 +250,4 @@ if {[string compare $this_date ""] == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.24 b/testsuite/expect/test1.24
index a2234c7eba2..b46dd3e9caf 100755
--- a/testsuite/expect/test1.24
+++ b/testsuite/expect/test1.24
@@ -74,8 +74,4 @@ if {$err_msg != 1} {
set exit_code 1
}
-
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.25 b/testsuite/expect/test1.25
index a1ee5388e77..d509e38f435 100755
--- a/testsuite/expect/test1.25
+++ b/testsuite/expect/test1.25
@@ -64,7 +64,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.26 b/testsuite/expect/test1.26
index 2f2b677f3d7..daefa48e565 100755
--- a/testsuite/expect/test1.26
+++ b/testsuite/expect/test1.26
@@ -265,7 +265,4 @@ if {$successes != $iterations} {
send_user "\nFAILURE: only $successes of $iterations completed successfully\n"
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.27 b/testsuite/expect/test1.27
index bdb2e994f04..4e3e50f31cb 100755
--- a/testsuite/expect/test1.27
+++ b/testsuite/expect/test1.27
@@ -123,7 +123,4 @@ if {$good < $total} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.28 b/testsuite/expect/test1.28
index ee97c86c8d0..87f96b76e6f 100755
--- a/testsuite/expect/test1.28
+++ b/testsuite/expect/test1.28
@@ -151,6 +151,5 @@ if {$matches != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.29 b/testsuite/expect/test1.29
index 9a57b2ea028..b09fcdc3dfa 100755
--- a/testsuite/expect/test1.29
+++ b/testsuite/expect/test1.29
@@ -248,8 +248,7 @@ if {$matches != $target} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- exec $bin_rm -f $file_err $file_in $file_prog_get $file_out
+ exec $bin_rm -f $file_err $file_in $file_prog_get $file_out
}
exit $exit_code
diff --git a/testsuite/expect/test1.3 b/testsuite/expect/test1.3
index 17b47ae4823..7554441cc6b 100755
--- a/testsuite/expect/test1.3
+++ b/testsuite/expect/test1.3
@@ -61,7 +61,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper srun version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.30 b/testsuite/expect/test1.30
index 12d34446b2a..c2378623755 100755
--- a/testsuite/expect/test1.30
+++ b/testsuite/expect/test1.30
@@ -94,7 +94,4 @@ if {$error == 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.31 b/testsuite/expect/test1.31
index 45fc221ac45..20d52d84c48 100755
--- a/testsuite/expect/test1.31
+++ b/testsuite/expect/test1.31
@@ -180,6 +180,5 @@ if {$max_node_val > $max_nodes} {
#
if {$exit_code == 0} {
exec $bin_rm -f $env_valu_stdout $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.32 b/testsuite/expect/test1.32
index 0519122da24..6813d06ae41 100755
--- a/testsuite/expect/test1.32
+++ b/testsuite/expect/test1.32
@@ -134,6 +134,5 @@ if {$fini_cnt != 1} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.33 b/testsuite/expect/test1.33
index 4f10cf24a9c..9b618d46572 100755
--- a/testsuite/expect/test1.33
+++ b/testsuite/expect/test1.33
@@ -113,6 +113,5 @@ if {$matches != 1} {
#
if {$exit_code == 0} {
exec $bin_rm -f $exit_script $test_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.34 b/testsuite/expect/test1.34
index c7cfa1a2810..1a490cf9c83 100755
--- a/testsuite/expect/test1.34
+++ b/testsuite/expect/test1.34
@@ -86,6 +86,5 @@ if {$matches != 1} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in $test_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.35 b/testsuite/expect/test1.35
index 20433ca7594..4be7b2a5ae3 100755
--- a/testsuite/expect/test1.35
+++ b/testsuite/expect/test1.35
@@ -160,7 +160,6 @@ if {$step_cnt != $steps_started} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $file_err
}
exit $exit_code
diff --git a/testsuite/expect/test1.36 b/testsuite/expect/test1.36
index b7afb7cbafb..d8d640d9c53 100755
--- a/testsuite/expect/test1.36
+++ b/testsuite/expect/test1.36
@@ -67,7 +67,4 @@ if {$task_output != [expr $task_cnt * $mult]} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.37 b/testsuite/expect/test1.37
index 44f5f11f1db..70abf423fcb 100755
--- a/testsuite/expect/test1.37
+++ b/testsuite/expect/test1.37
@@ -77,7 +77,4 @@ if {$task_output != $task_num} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.38 b/testsuite/expect/test1.38
index 4ad5b769d4b..0d669e39a5b 100755
--- a/testsuite/expect/test1.38
+++ b/testsuite/expect/test1.38
@@ -166,6 +166,5 @@ if {[expr $match_wait + $match_int + $match_term] != 2} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.4 b/testsuite/expect/test1.4
index 81952dcd55d..c24d37adec2 100755
--- a/testsuite/expect/test1.4
+++ b/testsuite/expect/test1.4
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: srun failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.40 b/testsuite/expect/test1.40
index 1b548dbfba9..bbf46c16414 100755
--- a/testsuite/expect/test1.40
+++ b/testsuite/expect/test1.40
@@ -162,6 +162,5 @@ if {$match_acct == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.41 b/testsuite/expect/test1.41
index 67e6524acb7..4be822607b1 100755
--- a/testsuite/expect/test1.41
+++ b/testsuite/expect/test1.41
@@ -95,7 +95,4 @@ if {$task_cnt != $resp_cnt} {
send_user "$task_cnt, $resp_cnt\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.42 b/testsuite/expect/test1.42
index 043d725054d..583a3784277 100755
--- a/testsuite/expect/test1.42
+++ b/testsuite/expect/test1.42
@@ -96,6 +96,5 @@ if {$match_job_state == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.43 b/testsuite/expect/test1.43
index ceb292cfdd7..eb7577f09f7 100755
--- a/testsuite/expect/test1.43
+++ b/testsuite/expect/test1.43
@@ -78,7 +78,4 @@ if {$jobs_run == 0} {
send_user "\nError expected. No worries.\n"
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.44 b/testsuite/expect/test1.44
index a3cea4c1b94..9a22470c7ee 100755
--- a/testsuite/expect/test1.44
+++ b/testsuite/expect/test1.44
@@ -113,7 +113,6 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
exec $bin_rm -f $file_in $file_out $file_err
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_err $file_in $file_out
} else {
send_user "\nFAILURE\n"
diff --git a/testsuite/expect/test1.45 b/testsuite/expect/test1.45
index eb557d5a3ac..a0315a5e19c 100755
--- a/testsuite/expect/test1.45
+++ b/testsuite/expect/test1.45
@@ -149,7 +149,6 @@ if {$num_procs_test3 != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.46 b/testsuite/expect/test1.46
index b2bb91736c3..d7e13935c78 100755
--- a/testsuite/expect/test1.46
+++ b/testsuite/expect/test1.46
@@ -101,6 +101,5 @@ if {$matches != 1} {
}
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_in.c
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.47 b/testsuite/expect/test1.47
index b5f555817ee..1b12ea67c2c 100755
--- a/testsuite/expect/test1.47
+++ b/testsuite/expect/test1.47
@@ -100,6 +100,5 @@ if {$matches == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.48 b/testsuite/expect/test1.48
index 9f810156ec1..f2cb6953fed 100755
--- a/testsuite/expect/test1.48
+++ b/testsuite/expect/test1.48
@@ -80,7 +80,4 @@ if {$got_job_grps == 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.49 b/testsuite/expect/test1.49
index 6b4af25e416..87e73cc3d18 100755
--- a/testsuite/expect/test1.49
+++ b/testsuite/expect/test1.49
@@ -162,6 +162,5 @@ if {$matches != $tasks} {
if {$exit_code == 0} {
exec $bin_rm -f $task_prolog $task_epilog $file_in
exec $bin_rm -f $file_out_pre $file_out_post
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.5 b/testsuite/expect/test1.5
index 91ba41233dc..dc33faced42 100755
--- a/testsuite/expect/test1.5
+++ b/testsuite/expect/test1.5
@@ -70,7 +70,4 @@ if {$matches < $target_matches} {
send_user "\nFAILURE: srun failed to report help message ($matches of $target_matches)\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.50 b/testsuite/expect/test1.50
index 7d2ca41c105..b41c1a3512d 100755
--- a/testsuite/expect/test1.50
+++ b/testsuite/expect/test1.50
@@ -87,7 +87,4 @@ if {$matches == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.51 b/testsuite/expect/test1.51
index 312a2e0debe..6ac33a2e63d 100755
--- a/testsuite/expect/test1.51
+++ b/testsuite/expect/test1.51
@@ -82,6 +82,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.52 b/testsuite/expect/test1.52
index 95b131525f2..315dcef00c8 100755
--- a/testsuite/expect/test1.52
+++ b/testsuite/expect/test1.52
@@ -181,6 +181,5 @@ for {set i 0} {$i<3} {incr i} {
if {$exit_code == 0} {
exec $bin_rm -f $hostfile
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.53 b/testsuite/expect/test1.53
index eac795928e8..8567c112b9c 100755
--- a/testsuite/expect/test1.53
+++ b/testsuite/expect/test1.53
@@ -81,7 +81,6 @@ if {$began_flag == 0} {
if {$exit_code == 0} {
exec rm -f $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.54 b/testsuite/expect/test1.54
index e9e205f6328..2526f767aaf 100755
--- a/testsuite/expect/test1.54
+++ b/testsuite/expect/test1.54
@@ -233,6 +233,5 @@ if {$matches != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.55 b/testsuite/expect/test1.55
index 5ecb9f31e67..17e522bf22c 100755
--- a/testsuite/expect/test1.55
+++ b/testsuite/expect/test1.55
@@ -138,7 +138,6 @@ expect {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $test_script
exit 0
} else {
diff --git a/testsuite/expect/test1.56 b/testsuite/expect/test1.56
index acded9118ee..73f233168ba 100755
--- a/testsuite/expect/test1.56
+++ b/testsuite/expect/test1.56
@@ -84,6 +84,5 @@ if {[catch {exec diff $file_in $file_out}]} {
exit 1
}
-send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out
exit 0
diff --git a/testsuite/expect/test1.58 b/testsuite/expect/test1.58
index 4762389d9f0..f19ffd9efcb 100755
--- a/testsuite/expect/test1.58
+++ b/testsuite/expect/test1.58
@@ -108,7 +108,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.59 b/testsuite/expect/test1.59
index 30f7932702b..178b3dc79d6 100755
--- a/testsuite/expect/test1.59
+++ b/testsuite/expect/test1.59
@@ -415,6 +415,5 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $hostfile
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.6 b/testsuite/expect/test1.6
index 51e30d6f7ed..bf922df852f 100755
--- a/testsuite/expect/test1.6
+++ b/testsuite/expect/test1.6
@@ -70,7 +70,4 @@ if {$matches != 1} {
send_user "\nFAILURE: srun failed to change working directory\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.60 b/testsuite/expect/test1.60
index fb1f02cd750..7304811144d 100755
--- a/testsuite/expect/test1.60
+++ b/testsuite/expect/test1.60
@@ -207,7 +207,4 @@ for {set node_id 0} {$node_id < $node_count} {incr node_id} {
#
# Post-processing
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.61 b/testsuite/expect/test1.61
index 339cf3152fd..6741ecf4bee 100755
--- a/testsuite/expect/test1.61
+++ b/testsuite/expect/test1.61
@@ -124,6 +124,5 @@ if {[wait_for_file $file_err] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.62 b/testsuite/expect/test1.62
index cbeaa8d5406..31d09e573ab 100755
--- a/testsuite/expect/test1.62
+++ b/testsuite/expect/test1.62
@@ -161,7 +161,4 @@ run_gpu_fail "gpu:tesla:INVALID_COUNT"
run_gpu_fail "gpu:INVALID_TYPE:"
run_gpu_fail "gpu:INVALID_TYPE:INVALID_COUNT"
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.63 b/testsuite/expect/test1.63
index fa836fb63c2..4ba7f31f5a7 100755
--- a/testsuite/expect/test1.63
+++ b/testsuite/expect/test1.63
@@ -105,6 +105,5 @@ if {$match_abort < 1} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.64 b/testsuite/expect/test1.64
index 8d6a5d027db..fde220386bc 100755
--- a/testsuite/expect/test1.64
+++ b/testsuite/expect/test1.64
@@ -75,7 +75,4 @@ if {$matches != 2} {
#
# Post-processing
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.65 b/testsuite/expect/test1.65
index 529e58fcc0c..cb18f9c5f5b 100755
--- a/testsuite/expect/test1.65
+++ b/testsuite/expect/test1.65
@@ -64,7 +64,4 @@ if {$matches < $target_matches} {
send_user "\nFAILURE: srun failed to report help message ($matches of $target_matches)\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.66 b/testsuite/expect/test1.66
index 19f0a71e6f6..dade59d8363 100755
--- a/testsuite/expect/test1.66
+++ b/testsuite/expect/test1.66
@@ -109,6 +109,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $script $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.67 b/testsuite/expect/test1.67
index 7c55fdfa22a..053dec8935e 100755
--- a/testsuite/expect/test1.67
+++ b/testsuite/expect/test1.67
@@ -109,7 +109,6 @@ if {$fini_match != 1} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $test_timer $test_srun $file_in
}
exit $exit_code
diff --git a/testsuite/expect/test1.68 b/testsuite/expect/test1.68
index 4b9a9a37655..896ab405769 100755
--- a/testsuite/expect/test1.68
+++ b/testsuite/expect/test1.68
@@ -152,7 +152,6 @@ if {$fini_match != 1} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $test_timer $test_srun $file_in $stop_srun
}
exit $exit_code
diff --git a/testsuite/expect/test1.69 b/testsuite/expect/test1.69
index 0411a022051..e59eb45b9b4 100755
--- a/testsuite/expect/test1.69
+++ b/testsuite/expect/test1.69
@@ -153,7 +153,6 @@ if {$fini_match != $run_timer} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $test_timer $test_srun $file_in
}
exit $exit_code
diff --git a/testsuite/expect/test1.7 b/testsuite/expect/test1.7
index a64a6e40b3a..8837f254759 100755
--- a/testsuite/expect/test1.7
+++ b/testsuite/expect/test1.7
@@ -180,7 +180,4 @@ if {$completions != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.70 b/testsuite/expect/test1.70
index ee384d4d1ae..752de164461 100755
--- a/testsuite/expect/test1.70
+++ b/testsuite/expect/test1.70
@@ -77,7 +77,6 @@ expect {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_out
}
exit $exit_code
diff --git a/testsuite/expect/test1.71 b/testsuite/expect/test1.71
index 432cc9b9282..16652d499a7 100755
--- a/testsuite/expect/test1.71
+++ b/testsuite/expect/test1.71
@@ -118,7 +118,6 @@ if {$error_match != 2} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_out $script $file_c
}
exit $exit_code
diff --git a/testsuite/expect/test1.72 b/testsuite/expect/test1.72
index c69227495fc..05cb0c171f9 100755
--- a/testsuite/expect/test1.72
+++ b/testsuite/expect/test1.72
@@ -95,7 +95,4 @@ if {$sub_match != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.73 b/testsuite/expect/test1.73
index 9ca6da48a88..b9c52a9036b 100755
--- a/testsuite/expect/test1.73
+++ b/testsuite/expect/test1.73
@@ -153,6 +153,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm -f $good_script $bad_script $good_job $bad_job
exec $bin_rm -f $conf_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.74 b/testsuite/expect/test1.74
index a94a51330c4..8498a89868d 100755
--- a/testsuite/expect/test1.74
+++ b/testsuite/expect/test1.74
@@ -314,9 +314,7 @@ srun_test [expr $node_cnt - 2] $acct_c2
cleanup
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.75 b/testsuite/expect/test1.75
index e521c76b902..8fd4880e14a 100755
--- a/testsuite/expect/test1.75
+++ b/testsuite/expect/test1.75
@@ -265,6 +265,5 @@ if { (($freq_lvl_1(low) > $freq_lvl_1(medium)) ||
if {$exit_code == 0} {
exec $bin_rm -f $file_id $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.76 b/testsuite/expect/test1.76
index dd1a24da7df..b1747e2d145 100755
--- a/testsuite/expect/test1.76
+++ b/testsuite/expect/test1.76
@@ -391,7 +391,6 @@ if {$nerr != 0} {
send_user "\n\nFAILURE: $nerr test cases failed.\n"
set exit_code 1
} else {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $wd/test1.76.out
}
exit $exit_code
diff --git a/testsuite/expect/test1.77 b/testsuite/expect/test1.77
index 29ccd910cfc..5919707d23d 100755
--- a/testsuite/expect/test1.77
+++ b/testsuite/expect/test1.77
@@ -72,7 +72,6 @@ if {$found != 1} {
send_user "\nFAILURE: COULD NOT FIND SLURM_JOB_NAME=banana\n"
exit 1
}
-send_user "SUCCESS\n"
#
# Tests -J using sbatch
@@ -112,7 +111,6 @@ if {$found != 1} {
}
if {$exit_code == 0} {
exec $bin_rm -f $file_out
- send_user "SUCCESS\n"
}
exec rm -f slurm-$job_id.out
@@ -140,5 +138,4 @@ if {$found != 1} {
exit 1
}
exec rm -f $file_in
-send_user "SUCCESS\n"
exit $exit_code
diff --git a/testsuite/expect/test1.8 b/testsuite/expect/test1.8
index c628dd1a3db..c0866fd43c3 100755
--- a/testsuite/expect/test1.8
+++ b/testsuite/expect/test1.8
@@ -165,6 +165,5 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.80 b/testsuite/expect/test1.80
index 3ebbea01e29..b493245728d 100755
--- a/testsuite/expect/test1.80
+++ b/testsuite/expect/test1.80
@@ -180,7 +180,4 @@ if {[string compare $tested_layout $expected_layout1] &&
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.81 b/testsuite/expect/test1.81
index 607c5ce81bb..3b707d7f4ba 100755
--- a/testsuite/expect/test1.81
+++ b/testsuite/expect/test1.81
@@ -294,7 +294,4 @@ if {$dup_host == 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.82 b/testsuite/expect/test1.82
index a7d47604fa2..0161110eb08 100755
--- a/testsuite/expect/test1.82
+++ b/testsuite/expect/test1.82
@@ -243,7 +243,4 @@ if {$dup_hostname == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.83 b/testsuite/expect/test1.83
index d27d1aab38e..cba8d4a2c33 100755
--- a/testsuite/expect/test1.83
+++ b/testsuite/expect/test1.83
@@ -122,7 +122,4 @@ lappend check_hosts_list $host_0_name $host_1_name $host_2_name
set exit_code [check_hosts_contiguous $partition $check_hosts_list]
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.84 b/testsuite/expect/test1.84
index f8bdcf35cf5..896b02657c7 100755
--- a/testsuite/expect/test1.84
+++ b/testsuite/expect/test1.84
@@ -225,7 +225,4 @@ if {$task_cnt != [expr $cpu_cnt / 2]} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.85 b/testsuite/expect/test1.85
index bc201f6bfca..885cb36e443 100755
--- a/testsuite/expect/test1.85
+++ b/testsuite/expect/test1.85
@@ -170,5 +170,3 @@ if {[ string compare $host2 $hostname] != 0} {
send_user "\nFAILURE: The execution hostname $hostname != $host2 requested hostname.\n"
exit 1
}
-
-send_user "\nSUCCESS\n"
diff --git a/testsuite/expect/test1.86 b/testsuite/expect/test1.86
index cdfcff230e8..bf7b7d65ff3 100755
--- a/testsuite/expect/test1.86
+++ b/testsuite/expect/test1.86
@@ -515,7 +515,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.87 b/testsuite/expect/test1.87
index db59c822b43..5485572ea54 100755
--- a/testsuite/expect/test1.87
+++ b/testsuite/expect/test1.87
@@ -336,7 +336,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.88 b/testsuite/expect/test1.88
index cac4a5cf530..517302ecd8b 100755
--- a/testsuite/expect/test1.88
+++ b/testsuite/expect/test1.88
@@ -237,7 +237,6 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err $test_prog ${test_prog}.o
- send_user "\nSUCCESS\n"
} else {
set matches 0
spawn head $file_err
diff --git a/testsuite/expect/test1.89 b/testsuite/expect/test1.89
index cd3746ac7f2..d8a916c960e 100755
--- a/testsuite/expect/test1.89
+++ b/testsuite/expect/test1.89
@@ -560,7 +560,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
} else {
send_user "\nNOTE: This test can fail if the node configuration in slurm.conf \n"
send_user " (sockets, cores, threads) differs from the actual configuration \n"
diff --git a/testsuite/expect/test1.9 b/testsuite/expect/test1.9
index 037f652cf5c..74a9d529c00 100755
--- a/testsuite/expect/test1.9
+++ b/testsuite/expect/test1.9
@@ -77,7 +77,4 @@ if {$verbosity != 1} {
send_user "\nFAILURE: Did not report job id with verbosity on\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test1.90 b/testsuite/expect/test1.90
index 8d17ec2a59f..d94a2ae43e4 100755
--- a/testsuite/expect/test1.90
+++ b/testsuite/expect/test1.90
@@ -587,7 +587,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
} else {
send_user "\nNOTE: This test can fail if the node configuration in slurm.conf \n"
send_user " (sockets, cores, threads) differs from the actual configuration\n"
diff --git a/testsuite/expect/test1.91 b/testsuite/expect/test1.91
index 6b1dae41838..e6b2f5f10ca 100755
--- a/testsuite/expect/test1.91
+++ b/testsuite/expect/test1.91
@@ -541,7 +541,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
} elseif { [test_fast_schedule] == 2 } {
exec $bin_rm -f $file_prog
send_user "\nNOTE: This test can fail if the node configuration in slurm.conf\n"
diff --git a/testsuite/expect/test1.92 b/testsuite/expect/test1.92
index 52a6d700385..1f96ae31e82 100755
--- a/testsuite/expect/test1.92
+++ b/testsuite/expect/test1.92
@@ -309,9 +309,7 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nNOTE: This test can fail if the node configuration in slurm.conf \n"
send_user " (sockets, cores, threads) differs from the actual configuration\n"
}
diff --git a/testsuite/expect/test1.93 b/testsuite/expect/test1.93
index d2567e5fdea..a3ec09935ab 100755
--- a/testsuite/expect/test1.93
+++ b/testsuite/expect/test1.93
@@ -114,9 +114,6 @@ proc end_test { } {
set_cpu_bind "node" $node_0 $node_cpu_bind_0
set_cpu_bind "node" $node_1 $node_cpu_bind_1
set_cpu_bind "partition" $def_part_name $partition_cpu_bind
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- }
exit $exit_code
}
diff --git a/testsuite/expect/test1.94 b/testsuite/expect/test1.94
index 799fdf5aa0b..b3fc5dcf2a9 100755
--- a/testsuite/expect/test1.94
+++ b/testsuite/expect/test1.94
@@ -190,7 +190,6 @@ if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
exec $bin_rm -f $master_prog ${master_prog}.o
exec $bin_rm -f $slave_prog ${slave_prog}.o
- send_user "\nSUCCESS\n"
} else {
set matches 0
spawn head $file_err
diff --git a/testsuite/expect/test1.95 b/testsuite/expect/test1.95
index 23fe752462a..e5ec556de0f 100755
--- a/testsuite/expect/test1.95
+++ b/testsuite/expect/test1.95
@@ -166,7 +166,6 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err $test_prog ${test_prog}.o
- send_user "\nSUCCESS\n"
} else {
send_user "Check contents of $file_err\n"
}
diff --git a/testsuite/expect/test1.96 b/testsuite/expect/test1.96
index 72538de7d5b..c5ea9cc01a6 100755
--- a/testsuite/expect/test1.96
+++ b/testsuite/expect/test1.96
@@ -151,7 +151,6 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err $test_prog ${test_prog}.o
- send_user "\nSUCCESS\n"
} else {
send_user "Check contents of $file_err\n"
}
diff --git a/testsuite/expect/test1.97 b/testsuite/expect/test1.97
index 1074e9a6015..9c3a3dfec34 100755
--- a/testsuite/expect/test1.97
+++ b/testsuite/expect/test1.97
@@ -384,6 +384,5 @@ check_tasks_off $ntaskpn [array get tasks] 2
if {$exit_code == 0} {
exec $bin_rm $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test1.99 b/testsuite/expect/test1.99
index e16e2d2f55f..8250dc45fba 100755
--- a/testsuite/expect/test1.99
+++ b/testsuite/expect/test1.99
@@ -228,6 +228,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm $file_in $tmp_job
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test10.1 b/testsuite/expect/test10.1
index 7b865004933..c330611690e 100755
--- a/testsuite/expect/test10.1
+++ b/testsuite/expect/test10.1
@@ -65,7 +65,4 @@ if {$matches != 1} {
send_user "\nFAILURE: smap failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.10 b/testsuite/expect/test10.10
index ac8467cf26e..d3a6cc2034f 100755
--- a/testsuite/expect/test10.10
+++ b/testsuite/expect/test10.10
@@ -131,7 +131,4 @@ if {$matches != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.11 b/testsuite/expect/test10.11
index cad078031cd..c4304b8be89 100755
--- a/testsuite/expect/test10.11
+++ b/testsuite/expect/test10.11
@@ -66,7 +66,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper smap version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.2 b/testsuite/expect/test10.2
index 784a698574a..0bbc61de86f 100755
--- a/testsuite/expect/test10.2
+++ b/testsuite/expect/test10.2
@@ -69,7 +69,4 @@ if {$matches != 2} {
send_user "\nFAILURE: smap failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.3 b/testsuite/expect/test10.3
index bf505dcb353..97d5f1eb88f 100755
--- a/testsuite/expect/test10.3
+++ b/testsuite/expect/test10.3
@@ -104,7 +104,4 @@ if {$matches != 6} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.4 b/testsuite/expect/test10.4
index e212b230de5..e7b03211ad9 100755
--- a/testsuite/expect/test10.4
+++ b/testsuite/expect/test10.4
@@ -89,7 +89,4 @@ if {$matches != 5} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.7 b/testsuite/expect/test10.7
index 137e488d1b9..bada8b12bf9 100755
--- a/testsuite/expect/test10.7
+++ b/testsuite/expect/test10.7
@@ -117,7 +117,4 @@ if {$matches != 8} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.8 b/testsuite/expect/test10.8
index 9bb3194fcbc..84a98833a09 100755
--- a/testsuite/expect/test10.8
+++ b/testsuite/expect/test10.8
@@ -113,7 +113,4 @@ if {$matches != 8} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test10.9 b/testsuite/expect/test10.9
index ec7e9c273e7..b5549ca9c7d 100755
--- a/testsuite/expect/test10.9
+++ b/testsuite/expect/test10.9
@@ -88,7 +88,4 @@ if {$matches <= 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test12.1 b/testsuite/expect/test12.1
index 17504fc06b9..d287639f786 100755
--- a/testsuite/expect/test12.1
+++ b/testsuite/expect/test12.1
@@ -89,7 +89,4 @@ if {$matches != 3} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test12.2 b/testsuite/expect/test12.2
index dbd96881c2c..3bcf3dc4a3f 100755
--- a/testsuite/expect/test12.2
+++ b/testsuite/expect/test12.2
@@ -115,8 +115,7 @@ proc _get_mem {prog} {
$prog $diff_mem $mem_size $mem_used]
return 1
} else {
- log_info [format "SUCCESS: %s memory use discrepancy of %s KB" \
- $prog $error_mem]
+ log_info [format "%s memory use discrepancy of %s KB" $prog $error_mem]
}
return 0
}
@@ -207,7 +206,7 @@ proc _get_file_size {prog} {
return 1
}
- log_info [format "SUCCESS: %s reported correct written and read file size (file_size:%s MB max_disk_write:%s MB max_disk_read:%s MB)" \
+ log_info [format "%s reported correct written and read file size (file_size:%s MB max_disk_write:%s MB max_disk_read:%s MB)" \
$prog $mb_file_size $max_disk_write $max_disk_read]
return 0
@@ -409,7 +408,7 @@ if {$error_time > $max_time_error} {
$error_time $sleep_time $elapsed_time]
set exit_code 1
} else {
- log_info "SUCCESS: sacct elapsed time discrepancy of $error_time secs"
+ log_info "sacct elapsed time discrepancy of $error_time secs"
}
set total_cpu 0
@@ -438,7 +437,7 @@ if {$total_cpu > $sleep_time} {
$total_cpu $sleep_time]
set exit_code 1
} else {
- log_info [format "SUCCESS: sacct TotalCPU time looks reasonable (%s seconds)" \
+ log_info [format "sacct TotalCPU time looks reasonable (%s seconds)" \
$total_cpu]
}
@@ -468,7 +467,7 @@ if {$min_cpu > $sleep_time} {
$min_cpu $sleep_time]
set exit_code 1
} else {
- log_info "SUCCESS: sacct MinCPU time looks reasonable ($min_cpu seconds)"
+ log_info "sacct MinCPU time looks reasonable ($min_cpu seconds)"
}
if {[_get_mem $sacct] != 0} {
diff --git a/testsuite/expect/test12.4 b/testsuite/expect/test12.4
index 78f52287448..c3034173cf6 100755
--- a/testsuite/expect/test12.4
+++ b/testsuite/expect/test12.4
@@ -731,7 +731,4 @@ if {$damatches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test12.5 b/testsuite/expect/test12.5
index 9f7e79aaeec..5e87d083941 100755
--- a/testsuite/expect/test12.5
+++ b/testsuite/expect/test12.5
@@ -112,7 +112,4 @@ if {$matches != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test12.6 b/testsuite/expect/test12.6
index faf5def02be..f6d5a1c1d98 100755
--- a/testsuite/expect/test12.6
+++ b/testsuite/expect/test12.6
@@ -226,7 +226,6 @@ if {$nerr > 3} {
if {$exit_code == 0} {
exec rm -f $file_prog $file_out $hdf5_file
- send_user "\nSUCCESS\n"
} else {
exec mv $hdf5_file test$test_id.hdf5
}
diff --git a/testsuite/expect/test12.7 b/testsuite/expect/test12.7
index 1a28fce04ad..81274ca2c99 100755
--- a/testsuite/expect/test12.7
+++ b/testsuite/expect/test12.7
@@ -52,7 +52,9 @@ proc endit { exit_code msg } {
global job_id bin_rm file_in
cancel_job $job_id
exec $bin_rm $file_in
- send_user "\n$msg\n"
+ if {$exit_code != 0} {
+ log_error "$msg"
+ }
exit $exit_code
}
@@ -395,4 +397,4 @@ if {$comp_count != 2} {
endit 1 "FAILURE: Bad COMPLETED count ($comp_count != 2)"
}
-endit 0 "SUCCESS"
+endit 0 ""
diff --git a/testsuite/expect/test12.8 b/testsuite/expect/test12.8
index 69bd764623f..f4d9c0ccb69 100755
--- a/testsuite/expect/test12.8
+++ b/testsuite/expect/test12.8
@@ -117,7 +117,6 @@ if {$failed_cnt != 2 || $timeout_cnt != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test12.9 b/testsuite/expect/test12.9
index 471a9e6f88f..6d316e691be 100755
--- a/testsuite/expect/test12.9
+++ b/testsuite/expect/test12.9
@@ -168,5 +168,4 @@ run_sacct "$array1_job_id,$array2_job_id\_3" [expr $expected_steps * 6] $expecte
# Now test sacct one task from the first array and the second full
run_sacct "$array1_job_id\_2,$array2_job_id" $expected_steps [expr $expected_steps * 6]
-send_user "\nSUCCESS\n"
exit $exit_code
diff --git a/testsuite/expect/test13.1 b/testsuite/expect/test13.1
index 937182fdde3..2ee9aac2c66 100755
--- a/testsuite/expect/test13.1
+++ b/testsuite/expect/test13.1
@@ -134,8 +134,5 @@ expect {
}
}
-if { $exit_code == 0 } {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test14.1 b/testsuite/expect/test14.1
index 85d4104c497..4ba526ac183 100755
--- a/testsuite/expect/test14.1
+++ b/testsuite/expect/test14.1
@@ -66,7 +66,4 @@ if {$matches != 1} {
send_user "\nFAILURE: sbcast failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test14.10 b/testsuite/expect/test14.10
index 67f70b3a7f2..7a2581f01ed 100755
--- a/testsuite/expect/test14.10
+++ b/testsuite/expect/test14.10
@@ -162,6 +162,5 @@ if {$matches != 2} {
if {$exit_code == 0} {
exec $bin_rm -rf $file_in1 $file_in2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test14.2 b/testsuite/expect/test14.2
index 5eeae55b6dd..12c72ebbb08 100755
--- a/testsuite/expect/test14.2
+++ b/testsuite/expect/test14.2
@@ -70,7 +70,4 @@ if {$matches != 2} {
send_user "\nFAILURE: sbcast failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test14.3 b/testsuite/expect/test14.3
index c1106065c37..160abcad644 100755
--- a/testsuite/expect/test14.3
+++ b/testsuite/expect/test14.3
@@ -67,7 +67,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper sbcast version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test14.4 b/testsuite/expect/test14.4
index d6ca716fbfa..1ab58e48ae7 100755
--- a/testsuite/expect/test14.4
+++ b/testsuite/expect/test14.4
@@ -142,6 +142,5 @@ if {$differ_found == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test14.5 b/testsuite/expect/test14.5
index 48229e32941..cee22213ad7 100755
--- a/testsuite/expect/test14.5
+++ b/testsuite/expect/test14.5
@@ -159,6 +159,5 @@ if {$reset == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test14.6 b/testsuite/expect/test14.6
index ef7bd262d7f..bb80f588ec9 100755
--- a/testsuite/expect/test14.6
+++ b/testsuite/expect/test14.6
@@ -139,6 +139,5 @@ if {$matches != 4} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test14.7 b/testsuite/expect/test14.7
index 072fd862248..14517dacc7c 100755
--- a/testsuite/expect/test14.7
+++ b/testsuite/expect/test14.7
@@ -129,6 +129,5 @@ if {$matches != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test14.8 b/testsuite/expect/test14.8
index bea16030877..d967a0481a8 100755
--- a/testsuite/expect/test14.8
+++ b/testsuite/expect/test14.8
@@ -138,6 +138,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test14.9 b/testsuite/expect/test14.9
index 4cab3024e48..9aa64a9702e 100755
--- a/testsuite/expect/test14.9
+++ b/testsuite/expect/test14.9
@@ -129,6 +129,5 @@ if {$matches != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.1 b/testsuite/expect/test15.1
index f92b07b348c..2396c3976b1 100755
--- a/testsuite/expect/test15.1
+++ b/testsuite/expect/test15.1
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: salloc failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.10 b/testsuite/expect/test15.10
index 983d65ce7b0..193132b03ca 100755
--- a/testsuite/expect/test15.10
+++ b/testsuite/expect/test15.10
@@ -79,7 +79,4 @@ for {set inx 1} {$inx < 4} {set inx [expr $inx * 2]} {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.11 b/testsuite/expect/test15.11
index f9bb9066e40..7c6d33ec334 100755
--- a/testsuite/expect/test15.11
+++ b/testsuite/expect/test15.11
@@ -126,7 +126,4 @@ if {$delta_prio < 950} {
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.12 b/testsuite/expect/test15.12
index e1c2b8102d8..d88163e9bd9 100755
--- a/testsuite/expect/test15.12
+++ b/testsuite/expect/test15.12
@@ -74,7 +74,4 @@ if {$err_msg != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.13 b/testsuite/expect/test15.13
index c21b7fd300f..d4ca34df474 100755
--- a/testsuite/expect/test15.13
+++ b/testsuite/expect/test15.13
@@ -102,7 +102,4 @@ if {$good < $total} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.14 b/testsuite/expect/test15.14
index d89adbdf39a..c50994eb60a 100755
--- a/testsuite/expect/test15.14
+++ b/testsuite/expect/test15.14
@@ -147,6 +147,5 @@ if {[wait_for_file $file_out2] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.15 b/testsuite/expect/test15.15
index 4d3663952aa..c16c9912bb9 100755
--- a/testsuite/expect/test15.15
+++ b/testsuite/expect/test15.15
@@ -102,7 +102,4 @@ if {$job_id == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.16 b/testsuite/expect/test15.16
index c6b53a53d64..f9b94dbac0f 100755
--- a/testsuite/expect/test15.16
+++ b/testsuite/expect/test15.16
@@ -108,7 +108,4 @@ if {$job_id == 0} {
#
# Post processing
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.18 b/testsuite/expect/test15.18
index 1791128fee5..1325269f2d3 100755
--- a/testsuite/expect/test15.18
+++ b/testsuite/expect/test15.18
@@ -76,7 +76,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.19 b/testsuite/expect/test15.19
index 32ea4639dbf..6dab0bbdeed 100755
--- a/testsuite/expect/test15.19
+++ b/testsuite/expect/test15.19
@@ -252,9 +252,6 @@ set partition [default_partition]
set node_count [get_node_cnt_in_part $partition]
if { $node_count < 2 } {
send_user "WARNING: Insufficient nodes in default partition to continue ($node_count < 2)\n"
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- }
exit $exit_code
}
@@ -338,7 +335,4 @@ if {$dup_host == 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.2 b/testsuite/expect/test15.2
index b7ec732f159..eec356e9e99 100755
--- a/testsuite/expect/test15.2
+++ b/testsuite/expect/test15.2
@@ -65,7 +65,4 @@ if {$matches != 2} {
send_user "\nFAILURE: salloc failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.20 b/testsuite/expect/test15.20
index 07839dbad62..71b2d5373da 100755
--- a/testsuite/expect/test15.20
+++ b/testsuite/expect/test15.20
@@ -271,7 +271,4 @@ if {$dup_hostname == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.21 b/testsuite/expect/test15.21
index 183cc9ce7d4..edf29cd12ff 100755
--- a/testsuite/expect/test15.21
+++ b/testsuite/expect/test15.21
@@ -131,8 +131,4 @@ lappend check_hosts_list $host_0_name $host_1_name $host_2_name
set exit_code [check_hosts_contiguous $partition $check_hosts_list]
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
-
exit $exit_code
diff --git a/testsuite/expect/test15.22 b/testsuite/expect/test15.22
index f14d2901fb9..d5aa2eb92dd 100755
--- a/testsuite/expect/test15.22
+++ b/testsuite/expect/test15.22
@@ -185,7 +185,4 @@ if {$legit_failure == 1} {
cancel_job $job_id
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.24 b/testsuite/expect/test15.24
index 8ec78e3a341..2b15e969f54 100755
--- a/testsuite/expect/test15.24
+++ b/testsuite/expect/test15.24
@@ -93,6 +93,5 @@ if {$task_cnt != $tasks} {
if {$exit_code == 0} {
file delete $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.25 b/testsuite/expect/test15.25
index 43fdef1e29d..92ed327b354 100755
--- a/testsuite/expect/test15.25
+++ b/testsuite/expect/test15.25
@@ -139,6 +139,5 @@ if {$match_acct == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.26 b/testsuite/expect/test15.26
index da3c090d430..c113b374bbf 100755
--- a/testsuite/expect/test15.26
+++ b/testsuite/expect/test15.26
@@ -79,7 +79,4 @@ if {[expr $wait_flag + $abort_flag] != 2} {
#
# Post-processing
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.27 b/testsuite/expect/test15.27
index c30dfcff2df..c06c215c92c 100755
--- a/testsuite/expect/test15.27
+++ b/testsuite/expect/test15.27
@@ -169,7 +169,4 @@ expect {
check_alloc
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.3 b/testsuite/expect/test15.3
index f7ae067b877..34642968882 100755
--- a/testsuite/expect/test15.3
+++ b/testsuite/expect/test15.3
@@ -61,7 +61,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper salloc version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.30 b/testsuite/expect/test15.30
index 0db813af802..914ba08b5a1 100755
--- a/testsuite/expect/test15.30
+++ b/testsuite/expect/test15.30
@@ -61,7 +61,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.31 b/testsuite/expect/test15.31
index d583aa0f0cd..6cc0441792b 100755
--- a/testsuite/expect/test15.31
+++ b/testsuite/expect/test15.31
@@ -43,9 +43,7 @@ print_header $test_id
proc endit { } {
global exit_code
reconfigure
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.32 b/testsuite/expect/test15.32
index 047de7a60f0..bc85c3505ff 100755
--- a/testsuite/expect/test15.32
+++ b/testsuite/expect/test15.32
@@ -279,6 +279,5 @@ if {$found != 0} {
if {$exit_code == 0} {
exec $bin_rm $test_salloc $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.33 b/testsuite/expect/test15.33
index 1cfaf873ff1..7abc8b70cdf 100755
--- a/testsuite/expect/test15.33
+++ b/testsuite/expect/test15.33
@@ -97,7 +97,4 @@ if {$job_id != 0} {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.34 b/testsuite/expect/test15.34
index 7f844cdb88f..87c0ece6824 100755
--- a/testsuite/expect/test15.34
+++ b/testsuite/expect/test15.34
@@ -65,7 +65,4 @@ if {$job_id != 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.35 b/testsuite/expect/test15.35
index 98d27605212..9b4a7aced69 100755
--- a/testsuite/expect/test15.35
+++ b/testsuite/expect/test15.35
@@ -43,9 +43,7 @@ print_header $test_id
proc endit { } {
global exit_code
reconfigure
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.36 b/testsuite/expect/test15.36
index e140f174ccc..1c7cd2ff969 100755
--- a/testsuite/expect/test15.36
+++ b/testsuite/expect/test15.36
@@ -70,7 +70,4 @@ if {$job_id != 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.37 b/testsuite/expect/test15.37
index 20ca0c7359c..57afeb20234 100755
--- a/testsuite/expect/test15.37
+++ b/testsuite/expect/test15.37
@@ -149,7 +149,4 @@ if {$exit_code == 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.38 b/testsuite/expect/test15.38
index af6c04beff2..8b3f96f1d7b 100755
--- a/testsuite/expect/test15.38
+++ b/testsuite/expect/test15.38
@@ -126,7 +126,4 @@ if {$not_support != 0} {
exit 0
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.39 b/testsuite/expect/test15.39
index bd42a949c5a..4a77dc6f110 100755
--- a/testsuite/expect/test15.39
+++ b/testsuite/expect/test15.39
@@ -106,7 +106,4 @@ if {$job_id == 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.4 b/testsuite/expect/test15.4
index a4bbf20e13e..ffe28764cb6 100755
--- a/testsuite/expect/test15.4
+++ b/testsuite/expect/test15.4
@@ -95,7 +95,4 @@ if {[string compare $login_grp_info $job_grp_info] != 0} {
send_user "\nFAILURE: Login and slurm user info mismatch\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.5 b/testsuite/expect/test15.5
index ccd410b860d..6315962cc56 100755
--- a/testsuite/expect/test15.5
+++ b/testsuite/expect/test15.5
@@ -183,6 +183,5 @@ if {$completions != 1} {
if {$exit_code == 0} {
file delete $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test15.6 b/testsuite/expect/test15.6
index 0a4df0b7fa5..9b8c394bbc1 100755
--- a/testsuite/expect/test15.6
+++ b/testsuite/expect/test15.6
@@ -87,7 +87,4 @@ if {$verbosity != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.7 b/testsuite/expect/test15.7
index dc46375dbd0..7951ac4b6c4 100755
--- a/testsuite/expect/test15.7
+++ b/testsuite/expect/test15.7
@@ -133,7 +133,4 @@ if {$matches != 5} {
if {[cancel_job $job_id] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.8 b/testsuite/expect/test15.8
index 6f571df8c20..c69281affdd 100755
--- a/testsuite/expect/test15.8
+++ b/testsuite/expect/test15.8
@@ -114,7 +114,4 @@ if {$matches != 1} {
send_user "\nFAILURE: Immediate initiation option failure\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test15.9 b/testsuite/expect/test15.9
index 6df9e80a0ce..7447e146710 100755
--- a/testsuite/expect/test15.9
+++ b/testsuite/expect/test15.9
@@ -104,7 +104,4 @@ if { $match != 1 } {
set exit_code 1
}
-if { $exit_code == 0 } {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test16.1 b/testsuite/expect/test16.1
index 8f1fd4d5cbd..1f1b1c9eb4a 100755
--- a/testsuite/expect/test16.1
+++ b/testsuite/expect/test16.1
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: sattach failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test16.2 b/testsuite/expect/test16.2
index 677f16b27bc..ccc7d7fa237 100755
--- a/testsuite/expect/test16.2
+++ b/testsuite/expect/test16.2
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: sattach failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test16.3 b/testsuite/expect/test16.3
index dfed410be9d..a5512d2bd30 100755
--- a/testsuite/expect/test16.3
+++ b/testsuite/expect/test16.3
@@ -62,7 +62,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper sattach version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test16.4 b/testsuite/expect/test16.4
index c3fa7e8443e..3bbb0831c71 100755
--- a/testsuite/expect/test16.4
+++ b/testsuite/expect/test16.4
@@ -206,7 +206,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
} else {
cancel_job $job_id
}
diff --git a/testsuite/expect/test17.1 b/testsuite/expect/test17.1
index 8e5ec80ccf6..51b6a91db27 100755
--- a/testsuite/expect/test17.1
+++ b/testsuite/expect/test17.1
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: sbatch failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test17.10 b/testsuite/expect/test17.10
index ef38fce973f..64a3f0fcf9e 100755
--- a/testsuite/expect/test17.10
+++ b/testsuite/expect/test17.10
@@ -138,6 +138,5 @@ if {[cancel_job $job_id] != 0} {
}
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.11 b/testsuite/expect/test17.11
index a56b57ad215..8ef9ea0b76e 100755
--- a/testsuite/expect/test17.11
+++ b/testsuite/expect/test17.11
@@ -179,6 +179,5 @@ if {$force_part == 0 && $match_oversubscribe != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.12 b/testsuite/expect/test17.12
index f3cb0e777dc..c4a13b09de4 100755
--- a/testsuite/expect/test17.12
+++ b/testsuite/expect/test17.12
@@ -1037,7 +1037,6 @@ clean_up
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test17.13 b/testsuite/expect/test17.13
index 965006aa988..e08fd77e1bf 100755
--- a/testsuite/expect/test17.13
+++ b/testsuite/expect/test17.13
@@ -140,6 +140,5 @@ if {$good < $total} {
if {$exit_code == 0} {
file delete $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.14 b/testsuite/expect/test17.14
index 23a04f0cc2a..bcff73505c4 100755
--- a/testsuite/expect/test17.14
+++ b/testsuite/expect/test17.14
@@ -293,6 +293,5 @@ if {$matches != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.15 b/testsuite/expect/test17.15
index 5e2948f6d41..735285519d7 100755
--- a/testsuite/expect/test17.15
+++ b/testsuite/expect/test17.15
@@ -234,8 +234,6 @@ if {$matches != $target} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- exec $bin_rm -f $file_err $file_in $file_prog_get $file_out
-
+ exec $bin_rm -f $file_err $file_in $file_prog_get $file_out
}
exit $exit_code
diff --git a/testsuite/expect/test17.16 b/testsuite/expect/test17.16
index 3cb0b8c6bb4..020170c2816 100755
--- a/testsuite/expect/test17.16
+++ b/testsuite/expect/test17.16
@@ -107,7 +107,6 @@ if {$arg_match == 0} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $file_err
}
exit $exit_code
diff --git a/testsuite/expect/test17.17 b/testsuite/expect/test17.17
index 6f50dd4b7c7..1decaccbb38 100755
--- a/testsuite/expect/test17.17
+++ b/testsuite/expect/test17.17
@@ -148,6 +148,5 @@ if {$waited == 0} {
cancel_job $job_id1
if {$exit_code == 0} {
exec $bin_rm -f $file_err $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.18 b/testsuite/expect/test17.18
index cf640619ac7..f85a8a1d49d 100755
--- a/testsuite/expect/test17.18
+++ b/testsuite/expect/test17.18
@@ -275,6 +275,5 @@ if {$purged_job == 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.19 b/testsuite/expect/test17.19
index 48a794a5a50..4c8a50e4c3a 100755
--- a/testsuite/expect/test17.19
+++ b/testsuite/expect/test17.19
@@ -162,7 +162,6 @@ send_user "\n\nSo far, so good....\n\n\n"
if {$part_cnt < 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
}
diff --git a/testsuite/expect/test17.2 b/testsuite/expect/test17.2
index d048d7e8577..caa647627fa 100755
--- a/testsuite/expect/test17.2
+++ b/testsuite/expect/test17.2
@@ -64,7 +64,4 @@ if {$matches != 2} {
send_user "\nFAILURE: sbatch failed to report help message ($matches != 2)\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test17.20 b/testsuite/expect/test17.20
index dbb3bef8352..2c77b48a6e5 100755
--- a/testsuite/expect/test17.20
+++ b/testsuite/expect/test17.20
@@ -109,6 +109,5 @@ if {$got_job_grps == 0} {
if {$exit_code == 0} {
file delete $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.21 b/testsuite/expect/test17.21
index caa2397dea9..df5398ac054 100755
--- a/testsuite/expect/test17.21
+++ b/testsuite/expect/test17.21
@@ -161,6 +161,5 @@ expect {
#
if {$exit_code == 0} {
file delete $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.22 b/testsuite/expect/test17.22
index 6365b0ffa64..319345feca2 100755
--- a/testsuite/expect/test17.22
+++ b/testsuite/expect/test17.22
@@ -67,7 +67,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test17.23 b/testsuite/expect/test17.23
index 0ab7c3363de..641c9e27588 100755
--- a/testsuite/expect/test17.23
+++ b/testsuite/expect/test17.23
@@ -186,8 +186,5 @@ if {$job_prio1 == 0 || $job_prio2 == 0 || $job_prio3 == 0} {
cancel_job $job_id1
cancel_job $job_id2
cancel_job $job_id3
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test17.24 b/testsuite/expect/test17.24
index cf9a9942d05..7dc668ce2fe 100755
--- a/testsuite/expect/test17.24
+++ b/testsuite/expect/test17.24
@@ -114,6 +114,5 @@ if { $matches != 2 } {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.25 b/testsuite/expect/test17.25
index e937e61e0eb..69538f19ac0 100755
--- a/testsuite/expect/test17.25
+++ b/testsuite/expect/test17.25
@@ -105,6 +105,5 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.26 b/testsuite/expect/test17.26
index 63141b312bf..721cfb3173a 100755
--- a/testsuite/expect/test17.26
+++ b/testsuite/expect/test17.26
@@ -92,6 +92,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.27 b/testsuite/expect/test17.27
index adb9e1a33cb..77ca21ef3fa 100755
--- a/testsuite/expect/test17.27
+++ b/testsuite/expect/test17.27
@@ -306,6 +306,5 @@ if {$dup_hostname == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.28 b/testsuite/expect/test17.28
index ab49f3788f2..6f217ffd1ea 100755
--- a/testsuite/expect/test17.28
+++ b/testsuite/expect/test17.28
@@ -185,6 +185,5 @@ if {[wait_for_job $job_id DONE] != 0} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.29 b/testsuite/expect/test17.29
index b57cb7b26f5..2682c11b01e 100755
--- a/testsuite/expect/test17.29
+++ b/testsuite/expect/test17.29
@@ -107,7 +107,6 @@ if {$arg_match == 0} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $file_err
}
exit $exit_code
diff --git a/testsuite/expect/test17.3 b/testsuite/expect/test17.3
index 824682b45eb..e95d0b16aba 100755
--- a/testsuite/expect/test17.3
+++ b/testsuite/expect/test17.3
@@ -62,7 +62,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper sbatch version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test17.31 b/testsuite/expect/test17.31
index 0e23b4f6ce7..e5900e9f479 100755
--- a/testsuite/expect/test17.31
+++ b/testsuite/expect/test17.31
@@ -170,6 +170,5 @@ if {$job_id != 0} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.32 b/testsuite/expect/test17.32
index f26634224bb..096cf4c80d2 100755
--- a/testsuite/expect/test17.32
+++ b/testsuite/expect/test17.32
@@ -116,6 +116,5 @@ if {$tasks != $task_cnt} {
if {$exit_code == 0} {
file delete $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.33 b/testsuite/expect/test17.33
index 668954b5372..9cba448caf1 100755
--- a/testsuite/expect/test17.33
+++ b/testsuite/expect/test17.33
@@ -214,6 +214,5 @@ if {$got_sleep_err != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.34 b/testsuite/expect/test17.34
index da18b812b7f..d941d6d9823 100755
--- a/testsuite/expect/test17.34
+++ b/testsuite/expect/test17.34
@@ -286,7 +286,6 @@ core_spec_job 1 $first_node [expr $core_cnt + 5] -1
core_spec_job 1 $first_node [expr $core_cnt + 7] -1
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $spec_in
}
exit $exit_code
diff --git a/testsuite/expect/test17.35 b/testsuite/expect/test17.35
index dc136e09cca..e78c3f6b19b 100755
--- a/testsuite/expect/test17.35
+++ b/testsuite/expect/test17.35
@@ -117,7 +117,6 @@ if {$rate < $target} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in
}
exit $exit_code
diff --git a/testsuite/expect/test17.36 b/testsuite/expect/test17.36
index 962c8e80d05..53708c4f145 100755
--- a/testsuite/expect/test17.36
+++ b/testsuite/expect/test17.36
@@ -435,7 +435,6 @@ delete_part $test_part_3
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test17.38 b/testsuite/expect/test17.38
index fec662e2f44..3b23dfcb1ff 100755
--- a/testsuite/expect/test17.38
+++ b/testsuite/expect/test17.38
@@ -239,6 +239,5 @@ expect {
if {$exit_code == 0} {
exec rm -f $file_prog $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.39 b/testsuite/expect/test17.39
index 5aed90c1915..ea3fcbe7eb6 100755
--- a/testsuite/expect/test17.39
+++ b/testsuite/expect/test17.39
@@ -162,7 +162,4 @@ cancel_job $fast_id
cancel_job $slow_id
cancel_job $dep_id
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test17.4 b/testsuite/expect/test17.4
index ab337805bb8..ff05efda3e5 100755
--- a/testsuite/expect/test17.4
+++ b/testsuite/expect/test17.4
@@ -120,6 +120,5 @@ if {[string compare $login_grp_info $job_grp_info] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.40 b/testsuite/expect/test17.40
index 08e6e96c34b..5b64818d9fc 100755
--- a/testsuite/expect/test17.40
+++ b/testsuite/expect/test17.40
@@ -281,7 +281,6 @@ thread_spec_job 1 $first_node [expr $thread_cnt + 1] -1
thread_spec_job 1 $first_node [expr $thread_cnt + 3] -1
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $spec_in
}
exit $exit_code
diff --git a/testsuite/expect/test17.41 b/testsuite/expect/test17.41
index 2e81e1b9804..3d6e368ff16 100755
--- a/testsuite/expect/test17.41
+++ b/testsuite/expect/test17.41
@@ -112,7 +112,6 @@ test_sbatch "$test_part\,$test_part\g"
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test17.42 b/testsuite/expect/test17.42
index ed06f6b1b66..ee29fa62c93 100755
--- a/testsuite/expect/test17.42
+++ b/testsuite/expect/test17.42
@@ -87,6 +87,5 @@ if {$match != 1} {
if {$exit_code == 0} {
exec rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.43 b/testsuite/expect/test17.43
index e2a4c5cd736..5d54d970ece 100755
--- a/testsuite/expect/test17.43
+++ b/testsuite/expect/test17.43
@@ -176,6 +176,5 @@ if {[wait_for_file $file_out] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.44 b/testsuite/expect/test17.44
index beef9996a99..5ffbda354ee 100755
--- a/testsuite/expect/test17.44
+++ b/testsuite/expect/test17.44
@@ -123,7 +123,6 @@ for {set task_id 1} {$task_id <= $tasks} {incr task_id} {
if {$exit_code == 0} {
exec $bin_rm -f $script1 $script2
- send_user "\nSUCCESS\n"
} else {
cancel_job $job_id1
cancel_job $job_id2
diff --git a/testsuite/expect/test17.45 b/testsuite/expect/test17.45
index fd764fdf8ec..72343851932 100755
--- a/testsuite/expect/test17.45
+++ b/testsuite/expect/test17.45
@@ -121,6 +121,5 @@ if {[wait_for_file $file_out] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_bbf $file_script $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.5 b/testsuite/expect/test17.5
index 926bc171b24..3de716e3912 100755
--- a/testsuite/expect/test17.5
+++ b/testsuite/expect/test17.5
@@ -405,6 +405,5 @@ if { [file exists $file_err2] } {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.51 b/testsuite/expect/test17.51
index a9ef8166df2..17f873b1777 100755
--- a/testsuite/expect/test17.51
+++ b/testsuite/expect/test17.51
@@ -705,6 +705,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm $tmp_job
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.52 b/testsuite/expect/test17.52
index 346227c9a4f..f46e7bf40db 100755
--- a/testsuite/expect/test17.52
+++ b/testsuite/expect/test17.52
@@ -406,6 +406,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm $tmp_job
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.53 b/testsuite/expect/test17.53
index 38a5f22e869..21d9ee46571 100755
--- a/testsuite/expect/test17.53
+++ b/testsuite/expect/test17.53
@@ -75,6 +75,5 @@ if {$job_id != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.54 b/testsuite/expect/test17.54
index c37cbf77262..03c26e32b0d 100755
--- a/testsuite/expect/test17.54
+++ b/testsuite/expect/test17.54
@@ -157,6 +157,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.55 b/testsuite/expect/test17.55
index 21695d3bc96..089feed3dda 100755
--- a/testsuite/expect/test17.55
+++ b/testsuite/expect/test17.55
@@ -256,6 +256,5 @@ if {$found != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.56 b/testsuite/expect/test17.56
index 543d3b5decf..3be3ab2094f 100755
--- a/testsuite/expect/test17.56
+++ b/testsuite/expect/test17.56
@@ -108,6 +108,5 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.57 b/testsuite/expect/test17.57
index 1f4af8a71bb..e80fdddd4bd 100755
--- a/testsuite/expect/test17.57
+++ b/testsuite/expect/test17.57
@@ -75,6 +75,5 @@ if {$job_id != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.58 b/testsuite/expect/test17.58
index fb5e2b63ce9..c93900a4533 100755
--- a/testsuite/expect/test17.58
+++ b/testsuite/expect/test17.58
@@ -47,7 +47,6 @@ proc endit { } {
reconfigure
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
diff --git a/testsuite/expect/test17.59 b/testsuite/expect/test17.59
index 13378f615d3..720e62fdabd 100755
--- a/testsuite/expect/test17.59
+++ b/testsuite/expect/test17.59
@@ -79,6 +79,5 @@ if {$job_id != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.6 b/testsuite/expect/test17.6
index d71a2ad8c90..c19a58a6c2a 100755
--- a/testsuite/expect/test17.6
+++ b/testsuite/expect/test17.6
@@ -161,6 +161,5 @@ if {$task_cnt != $tasks} {
if {$exit_code == 0} {
file delete $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.60 b/testsuite/expect/test17.60
index fdac0fe782a..3712475febf 100755
--- a/testsuite/expect/test17.60
+++ b/testsuite/expect/test17.60
@@ -137,6 +137,5 @@ if {$exit_code == 1} {
send_user "\nFAILURE: batch submitted with a deadline too short\n"
} else {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.61 b/testsuite/expect/test17.61
index 1b56fee0957..ab1009629b6 100755
--- a/testsuite/expect/test17.61
+++ b/testsuite/expect/test17.61
@@ -131,6 +131,5 @@ if {$not_support != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.62 b/testsuite/expect/test17.62
index 6711c1e359b..bd0a7d775f5 100755
--- a/testsuite/expect/test17.62
+++ b/testsuite/expect/test17.62
@@ -131,6 +131,5 @@ foreach option [array names check_list] {
cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -fr $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.63 b/testsuite/expect/test17.63
index 9ad9c91081b..7c0add03377 100755
--- a/testsuite/expect/test17.63
+++ b/testsuite/expect/test17.63
@@ -151,6 +151,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_script $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.64 b/testsuite/expect/test17.64
index 24314841f7a..216ae2ce919 100755
--- a/testsuite/expect/test17.64
+++ b/testsuite/expect/test17.64
@@ -404,6 +404,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm $tmp_job
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test17.8 b/testsuite/expect/test17.8
index 5bf2313cb4d..c403ed4aef9 100755
--- a/testsuite/expect/test17.8
+++ b/testsuite/expect/test17.8
@@ -50,7 +50,6 @@ proc endit { } {
reconfigure
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: exiting with exit code $exit_code\n"
}
diff --git a/testsuite/expect/test17.9 b/testsuite/expect/test17.9
index 086a539d11c..24cb7ff59cd 100755
--- a/testsuite/expect/test17.9
+++ b/testsuite/expect/test17.9
@@ -92,6 +92,5 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test19.1 b/testsuite/expect/test19.1
index 740bbc1e503..b8fef24a963 100755
--- a/testsuite/expect/test19.1
+++ b/testsuite/expect/test19.1
@@ -61,7 +61,4 @@ if {$matches < 2} {
send_user "\nFAILURE: strigger failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test19.2 b/testsuite/expect/test19.2
index 4cec33dec12..abdc5e3c801 100755
--- a/testsuite/expect/test19.2
+++ b/testsuite/expect/test19.2
@@ -57,7 +57,4 @@ if {$matches < 1} {
send_user "\nFAILURE: strigger failed to report usage message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test19.3 b/testsuite/expect/test19.3
index 3f5602f318f..d240157e095 100755
--- a/testsuite/expect/test19.3
+++ b/testsuite/expect/test19.3
@@ -121,7 +121,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test19.4 b/testsuite/expect/test19.4
index c8ed12d22b0..2193de002a1 100755
--- a/testsuite/expect/test19.4
+++ b/testsuite/expect/test19.4
@@ -161,7 +161,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test19.5 b/testsuite/expect/test19.5
index e3d5d7fd0d7..42bae3f2977 100755
--- a/testsuite/expect/test19.5
+++ b/testsuite/expect/test19.5
@@ -243,7 +243,6 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_in_fini $file_in_time
exec $bin_rm -f $file_out_fini $file_out_time
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test19.6 b/testsuite/expect/test19.6
index 984cb3cbb2c..e3fa1eaa45b 100755
--- a/testsuite/expect/test19.6
+++ b/testsuite/expect/test19.6
@@ -409,7 +409,6 @@ if {$node_matches != 0} {
cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_in_fini $file_in_time $file_in_up $file_in_down $file_in_reconfig
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test19.7 b/testsuite/expect/test19.7
index bbad42e2ee9..4c91603f2d8 100755
--- a/testsuite/expect/test19.7
+++ b/testsuite/expect/test19.7
@@ -185,7 +185,6 @@ if {$idle_matches != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_in_idle $file_out
- send_user "\nSUCCESS\n"
}
# clear any vestigial triggers
exec $strigger --clear --quiet --user=$uid
diff --git a/testsuite/expect/test19.8 b/testsuite/expect/test19.8
index ed16302c870..d8e73d921c1 100755
--- a/testsuite/expect/test19.8
+++ b/testsuite/expect/test19.8
@@ -137,7 +137,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $trigger_file_in $trigger_file_out
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test19.9 b/testsuite/expect/test19.9
index 09c60ae7c5e..696801e1033 100755
--- a/testsuite/expect/test19.9
+++ b/testsuite/expect/test19.9
@@ -117,7 +117,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $trigger_file_out $trigger_file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test2.1 b/testsuite/expect/test2.1
index 3d715b4f3d4..d79de0a3827 100755
--- a/testsuite/expect/test2.1
+++ b/testsuite/expect/test2.1
@@ -61,7 +61,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper scontrol version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.10 b/testsuite/expect/test2.10
index f1b342597b8..30d357cdb19 100755
--- a/testsuite/expect/test2.10
+++ b/testsuite/expect/test2.10
@@ -83,7 +83,4 @@ if {$matches != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.11 b/testsuite/expect/test2.11
index c1d5ffab16e..9a2bcecb823 100755
--- a/testsuite/expect/test2.11
+++ b/testsuite/expect/test2.11
@@ -116,7 +116,6 @@ if {$matches != 3} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out
}
exit $exit_code
diff --git a/testsuite/expect/test2.12 b/testsuite/expect/test2.12
index 3ed97b0a0c8..68ddd6b1388 100755
--- a/testsuite/expect/test2.12
+++ b/testsuite/expect/test2.12
@@ -106,7 +106,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.13 b/testsuite/expect/test2.13
index ef1866b2d6a..849f0a11c61 100755
--- a/testsuite/expect/test2.13
+++ b/testsuite/expect/test2.13
@@ -181,7 +181,6 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test2.14 b/testsuite/expect/test2.14
index a8fccee703c..695c956841d 100755
--- a/testsuite/expect/test2.14
+++ b/testsuite/expect/test2.14
@@ -158,6 +158,5 @@ if {$node_count != 3} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_out2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test2.15 b/testsuite/expect/test2.15
index 201f802ae71..83c179c8fd2 100755
--- a/testsuite/expect/test2.15
+++ b/testsuite/expect/test2.15
@@ -154,6 +154,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test2.16 b/testsuite/expect/test2.16
index 05895e258b9..5e7984973ab 100755
--- a/testsuite/expect/test2.16
+++ b/testsuite/expect/test2.16
@@ -219,7 +219,4 @@ check_part DenyAccounts none
#
delete_part
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.17 b/testsuite/expect/test2.17
index 345a631863e..b30aa030adb 100755
--- a/testsuite/expect/test2.17
+++ b/testsuite/expect/test2.17
@@ -221,8 +221,4 @@ check_part DenyQos none
#
delete_part
-
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.18 b/testsuite/expect/test2.18
index b7ea99e688e..459c205cfa6 100755
--- a/testsuite/expect/test2.18
+++ b/testsuite/expect/test2.18
@@ -286,7 +286,4 @@ if {[cleanup] != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.19 b/testsuite/expect/test2.19
index c9d99b8e9bc..f8f1d64490f 100755
--- a/testsuite/expect/test2.19
+++ b/testsuite/expect/test2.19
@@ -314,7 +314,4 @@ if {[cleanup] != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.2 b/testsuite/expect/test2.2
index 5ed0f05b911..67616e0655c 100755
--- a/testsuite/expect/test2.2
+++ b/testsuite/expect/test2.2
@@ -69,7 +69,4 @@ if {$matches != 3} {
send_user "\nFAILURE: scontrol help message not as expected\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.20 b/testsuite/expect/test2.20
index 86a9a4fae1d..66f901c8b11 100755
--- a/testsuite/expect/test2.20
+++ b/testsuite/expect/test2.20
@@ -156,7 +156,4 @@ if {$matches != 8} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.21 b/testsuite/expect/test2.21
index e6a693b325e..ac576ba7e62 100755
--- a/testsuite/expect/test2.21
+++ b/testsuite/expect/test2.21
@@ -146,7 +146,6 @@ check_job_state $job_id PENDING|RUNNING
cancel_job $job_id
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $complete_script $fail_script
}
exit $exit_code
diff --git a/testsuite/expect/test2.22 b/testsuite/expect/test2.22
index 82b28b72312..4037b71deab 100755
--- a/testsuite/expect/test2.22
+++ b/testsuite/expect/test2.22
@@ -160,7 +160,6 @@ check_release $job_id
cancel_job $job_id
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $script
}
diff --git a/testsuite/expect/test2.23 b/testsuite/expect/test2.23
index 1c4e5d6b706..0d5d2c03dc7 100755
--- a/testsuite/expect/test2.23
+++ b/testsuite/expect/test2.23
@@ -130,7 +130,6 @@ check_release $job_id
cancel_job $job_id
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $script
}
diff --git a/testsuite/expect/test2.24 b/testsuite/expect/test2.24
index 23db9659ba7..bdb79b8e443 100755
--- a/testsuite/expect/test2.24
+++ b/testsuite/expect/test2.24
@@ -159,7 +159,6 @@ if {$tot_match != $opt_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $new_conf
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test2.25 b/testsuite/expect/test2.25
index 657827a3b84..40065ab1bfd 100755
--- a/testsuite/expect/test2.25
+++ b/testsuite/expect/test2.25
@@ -334,7 +334,4 @@ if {[test_using_slurmdbd]} {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.26 b/testsuite/expect/test2.26
index a46410e3085..44d0ee125b4 100755
--- a/testsuite/expect/test2.26
+++ b/testsuite/expect/test2.26
@@ -195,6 +195,5 @@ if {$prio(0) <= $prio(1) || $prio(0) <= $prio(2)} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
end_it
diff --git a/testsuite/expect/test2.3 b/testsuite/expect/test2.3
index d1985e6e04e..664045cc64f 100755
--- a/testsuite/expect/test2.3
+++ b/testsuite/expect/test2.3
@@ -65,7 +65,4 @@ if {$matches != 1} {
send_user "\nFAILURE: scontrol ping output error ($matches != 1)\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.4 b/testsuite/expect/test2.4
index 610b0fefe55..ac54d3c938e 100755
--- a/testsuite/expect/test2.4
+++ b/testsuite/expect/test2.4
@@ -166,7 +166,4 @@ if {$matches != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.5 b/testsuite/expect/test2.5
index 2cb7a630f3b..569d2119314 100755
--- a/testsuite/expect/test2.5
+++ b/testsuite/expect/test2.5
@@ -248,7 +248,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.6 b/testsuite/expect/test2.6
index 98337130328..3533074fe6d 100755
--- a/testsuite/expect/test2.6
+++ b/testsuite/expect/test2.6
@@ -92,7 +92,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test2.7 b/testsuite/expect/test2.7
index d647a070c40..6ced27f7b27 100755
--- a/testsuite/expect/test2.7
+++ b/testsuite/expect/test2.7
@@ -134,7 +134,6 @@ if {$job_id != $scontrol_id} {
set exit_code 1
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $file_err
}
exit $exit_code
diff --git a/testsuite/expect/test2.8 b/testsuite/expect/test2.8
index cf71849002c..7f778dea6f1 100755
--- a/testsuite/expect/test2.8
+++ b/testsuite/expect/test2.8
@@ -65,9 +65,6 @@ proc end_it {code} {
cancel_job $job_id2
}
exec $bin_rm -f slurm-$job_id1.sh $test_id.sh
- if {$code == 0} {
- send_user "\nSUCCESS\n"
- }
exit $code
}
diff --git a/testsuite/expect/test2.9 b/testsuite/expect/test2.9
index eb5d32c5c8a..bfd9af3b42b 100755
--- a/testsuite/expect/test2.9
+++ b/testsuite/expect/test2.9
@@ -56,7 +56,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test20.1 b/testsuite/expect/test20.1
index 9a507daf83c..3606b67be81 100755
--- a/testsuite/expect/test20.1
+++ b/testsuite/expect/test20.1
@@ -112,6 +112,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.10 b/testsuite/expect/test20.10
index 8040855b027..a450764c59e 100755
--- a/testsuite/expect/test20.10
+++ b/testsuite/expect/test20.10
@@ -60,7 +60,4 @@ if {$found != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test20.11 b/testsuite/expect/test20.11
index bb4c4a8db9f..eeb50d9ee02 100755
--- a/testsuite/expect/test20.11
+++ b/testsuite/expect/test20.11
@@ -84,6 +84,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.12 b/testsuite/expect/test20.12
index 16f2959ebc2..a3fd336f88a 100755
--- a/testsuite/expect/test20.12
+++ b/testsuite/expect/test20.12
@@ -165,5 +165,4 @@ set var2_name "${var1_name}_2"
run_qsub $var1_name "another_value" $var2_name $variable2_value \
"-V -v $var1_name=another_value" "#SBATCH --export=NONE"
-send_user "\nSUCCESS\n"
exit 0
diff --git a/testsuite/expect/test20.13 b/testsuite/expect/test20.13
index ea579d798c2..65edf74da89 100755
--- a/testsuite/expect/test20.13
+++ b/testsuite/expect/test20.13
@@ -222,6 +222,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.2 b/testsuite/expect/test20.2
index 672efba7a36..95655d77a57 100755
--- a/testsuite/expect/test20.2
+++ b/testsuite/expect/test20.2
@@ -98,6 +98,5 @@ catch {exec $qdel $job_id}
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.3 b/testsuite/expect/test20.3
index bf2b76dacb3..1d6a87dd12d 100755
--- a/testsuite/expect/test20.3
+++ b/testsuite/expect/test20.3
@@ -120,6 +120,5 @@ if {($matches != 0) || ($status == 0)} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.4 b/testsuite/expect/test20.4
index 70293abe9da..596cb899240 100755
--- a/testsuite/expect/test20.4
+++ b/testsuite/expect/test20.4
@@ -62,7 +62,4 @@ if {$matches == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test20.5 b/testsuite/expect/test20.5
index 6cfc0492074..fff748e3df5 100755
--- a/testsuite/expect/test20.5
+++ b/testsuite/expect/test20.5
@@ -60,7 +60,4 @@ if {$found != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test20.6 b/testsuite/expect/test20.6
index 0e2ec4fcbb8..07e88b521c1 100755
--- a/testsuite/expect/test20.6
+++ b/testsuite/expect/test20.6
@@ -129,6 +129,5 @@ if {[cancel_job $job_id] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.7 b/testsuite/expect/test20.7
index be1c4757c86..0f4d4874c25 100755
--- a/testsuite/expect/test20.7
+++ b/testsuite/expect/test20.7
@@ -121,6 +121,5 @@ if {[cancel_job $job_id] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.8 b/testsuite/expect/test20.8
index 3b374e4f24e..42b05f0baa9 100755
--- a/testsuite/expect/test20.8
+++ b/testsuite/expect/test20.8
@@ -114,6 +114,5 @@ if {[cancel_job $job_id] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test20.9 b/testsuite/expect/test20.9
index 12522111b6a..ae10e84c59d 100755
--- a/testsuite/expect/test20.9
+++ b/testsuite/expect/test20.9
@@ -84,6 +84,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test21.1 b/testsuite/expect/test21.1
index 616e4272585..085d851ffdc 100755
--- a/testsuite/expect/test21.1
+++ b/testsuite/expect/test21.1
@@ -71,7 +71,4 @@ if {$matches != 3} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test21.11 b/testsuite/expect/test21.11
index 9926bf79fed..ecf020723b4 100755
--- a/testsuite/expect/test21.11
+++ b/testsuite/expect/test21.11
@@ -297,7 +297,4 @@ if { ![check_acct_associations] } {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test21.19 b/testsuite/expect/test21.19
index f4fe6437c79..5142225d965 100755
--- a/testsuite/expect/test21.19
+++ b/testsuite/expect/test21.19
@@ -235,9 +235,7 @@ incr exit_code [remove_user "" "" "$us1,$us2,$us3"]
incr exit_code [remove_acct "" "$nm1,$nm2,$nm3"]
incr exit_code [remove_cluster "$tc1,$tc2,$tc3"]
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test21.2 b/testsuite/expect/test21.2
index 2e953a70cbd..7b2b937133f 100755
--- a/testsuite/expect/test21.2
+++ b/testsuite/expect/test21.2
@@ -71,7 +71,4 @@ if {$matches != 3} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test21.29 b/testsuite/expect/test21.29
index c8b5c0ad2a8..ac0e5dfc68a 100755
--- a/testsuite/expect/test21.29
+++ b/testsuite/expect/test21.29
@@ -111,9 +111,7 @@ set exit_code [check_qos_limits $qos_name [array get qos]]
# Next is clean up and the end
incr exit_code [remove_qos "$qos_name"]
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test21.3 b/testsuite/expect/test21.3
index e1ddc669591..8029b6d188e 100755
--- a/testsuite/expect/test21.3
+++ b/testsuite/expect/test21.3
@@ -63,7 +63,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test21.31 b/testsuite/expect/test21.31
index 4180a4bfd52..4d0261fed80 100755
--- a/testsuite/expect/test21.31
+++ b/testsuite/expect/test21.31
@@ -277,9 +277,7 @@ if {[check_resource_limits $sr3 [array get resource2_chck]] == 1} {
incr exit_code [remove_res $sr2,$sr3]
incr exit_code [remove_cluster $tc2]
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test21.32 b/testsuite/expect/test21.32
index edc40a44644..7566915a2ed 100755
--- a/testsuite/expect/test21.32
+++ b/testsuite/expect/test21.32
@@ -201,8 +201,6 @@ check_pre " "
remove_qos $qos_names_str
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test21.33 b/testsuite/expect/test21.33
index e90cba6f232..fd908f53643 100755
--- a/testsuite/expect/test21.33
+++ b/testsuite/expect/test21.33
@@ -226,9 +226,7 @@ if {$match != 0} {
remove_cluster $test_cluster
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test21.36 b/testsuite/expect/test21.36
index ce505860b26..6f890934605 100755
--- a/testsuite/expect/test21.36
+++ b/testsuite/expect/test21.36
@@ -63,9 +63,7 @@ proc endit { } {
global exit_code bin_rm sql_query sql_query_rem
cleanup
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test21.37 b/testsuite/expect/test21.37
index 7cefdb15774..74dfa28a3a4 100755
--- a/testsuite/expect/test21.37
+++ b/testsuite/expect/test21.37
@@ -91,7 +91,4 @@ if {$matches != 6} {
send_user "\nFAILURE: sacctmgr show stats response bad ($matches != 6).\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test21.4 b/testsuite/expect/test21.4
index db713b79d8a..a42302f87a8 100755
--- a/testsuite/expect/test21.4
+++ b/testsuite/expect/test21.4
@@ -63,7 +63,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test22.1 b/testsuite/expect/test22.1
index f9b8d83c247..6a83de5631a 100755
--- a/testsuite/expect/test22.1
+++ b/testsuite/expect/test22.1
@@ -639,9 +639,7 @@ if {$exit_code == 0} {
exec $bin_rm -f $sql_rem_clus1
exec $bin_rm -f $sql_in_clus2
exec $bin_rm -f $sql_rem_clus2
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
} else {
diff --git a/testsuite/expect/test22.2 b/testsuite/expect/test22.2
index cc3df7f37d3..6f18048a767 100755
--- a/testsuite/expect/test22.2
+++ b/testsuite/expect/test22.2
@@ -318,7 +318,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test23.1 b/testsuite/expect/test23.1
index 5d05bf7639b..4a6b82e7e12 100755
--- a/testsuite/expect/test23.1
+++ b/testsuite/expect/test23.1
@@ -191,9 +191,4 @@ if {$matches != 1} {
send_user "\nsstat --version test GOOD!\n"
}
-
-
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test23.2 b/testsuite/expect/test23.2
index b98dee7b471..20eafcaaf26 100755
--- a/testsuite/expect/test23.2
+++ b/testsuite/expect/test23.2
@@ -659,6 +659,5 @@ if {$damatches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_in3
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test24.1 b/testsuite/expect/test24.1
index ac465d9c3cc..c6183f0e4fb 100755
--- a/testsuite/expect/test24.1
+++ b/testsuite/expect/test24.1
@@ -138,6 +138,5 @@ if {$matches != 13} {
if {$exit_code == 0} {
file delete $test_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test24.2 b/testsuite/expect/test24.2
index b8c36191755..b923ea937dc 100755
--- a/testsuite/expect/test24.2
+++ b/testsuite/expect/test24.2
@@ -395,11 +395,7 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
- send_user "\nFAILURE
-
-\n"
+if {$exit_code != 0} {
+ send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test24.3 b/testsuite/expect/test24.3
index 09c8f6d6e42..3de1d742d47 100755
--- a/testsuite/expect/test24.3
+++ b/testsuite/expect/test24.3
@@ -180,6 +180,5 @@ if {$matches != 22} {
if {$exit_code == 0} {
file delete $test_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test24.4 b/testsuite/expect/test24.4
index 4722df5e911..0db7844d743 100755
--- a/testsuite/expect/test24.4
+++ b/testsuite/expect/test24.4
@@ -240,6 +240,5 @@ if {$matches != $expected_matches} {
if {$exit_code == 0} {
file delete $test_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test25.1 b/testsuite/expect/test25.1
index de35184ddb8..76074d7910e 100755
--- a/testsuite/expect/test25.1
+++ b/testsuite/expect/test25.1
@@ -718,6 +718,5 @@ cancel_job $jobid2
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test27.1 b/testsuite/expect/test27.1
index 653913da6c3..875736ebe59 100755
--- a/testsuite/expect/test27.1
+++ b/testsuite/expect/test27.1
@@ -59,7 +59,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test27.2 b/testsuite/expect/test27.2
index 04e09cc3b0e..adb9153ad8b 100755
--- a/testsuite/expect/test27.2
+++ b/testsuite/expect/test27.2
@@ -63,7 +63,4 @@ if {$matches != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test27.3 b/testsuite/expect/test27.3
index 1f3750ae304..10fdddab169 100755
--- a/testsuite/expect/test27.3
+++ b/testsuite/expect/test27.3
@@ -59,7 +59,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test27.4 b/testsuite/expect/test27.4
index 52088cd4488..d8cf9923a5c 100755
--- a/testsuite/expect/test27.4
+++ b/testsuite/expect/test27.4
@@ -99,7 +99,4 @@ if {$jobs_started <= $start_begin} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test27.5 b/testsuite/expect/test27.5
index f0c98a5f20e..3fa062a048e 100755
--- a/testsuite/expect/test27.5
+++ b/testsuite/expect/test27.5
@@ -97,7 +97,4 @@ if {$jobs_started != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test28.1 b/testsuite/expect/test28.1
index dbef6f9d6fe..1fa8fe764d1 100755
--- a/testsuite/expect/test28.1
+++ b/testsuite/expect/test28.1
@@ -202,6 +202,5 @@ scontrol_check $job_id
if {$exit_code == 0} {
file delete $file_in $file_out $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.10 b/testsuite/expect/test28.10
index d23f99b2e44..32a59f62428 100755
--- a/testsuite/expect/test28.10
+++ b/testsuite/expect/test28.10
@@ -125,6 +125,5 @@ if {[cancel_job $job_id] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.12 b/testsuite/expect/test28.12
index 99b4689fd9d..b72a5206e6e 100755
--- a/testsuite/expect/test28.12
+++ b/testsuite/expect/test28.12
@@ -113,6 +113,5 @@ if {$match != 1} {
cancel_job $job_id
if {$exit_code == 0} {
file delete $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.13 b/testsuite/expect/test28.13
index b4c909c0314..282eb996eed 100755
--- a/testsuite/expect/test28.13
+++ b/testsuite/expect/test28.13
@@ -139,6 +139,5 @@ if {$match != 3} {
cancel_job $job_id
if {$exit_code == 0} {
file delete $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.2 b/testsuite/expect/test28.2
index 14bc0c22d5d..547f8ecf520 100755
--- a/testsuite/expect/test28.2
+++ b/testsuite/expect/test28.2
@@ -217,7 +217,6 @@ for {set index 0} {$index < $array_end} {incr index} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
delete_file
} else {
send_user "\nFAILURE\n"
diff --git a/testsuite/expect/test28.3 b/testsuite/expect/test28.3
index 2401b7ca5e7..997ff397e95 100755
--- a/testsuite/expect/test28.3
+++ b/testsuite/expect/test28.3
@@ -101,6 +101,5 @@ if {$job_id != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.4 b/testsuite/expect/test28.4
index 75c527c295e..915b9c44118 100755
--- a/testsuite/expect/test28.4
+++ b/testsuite/expect/test28.4
@@ -142,6 +142,5 @@ if {[cancel_job $job_id] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.5 b/testsuite/expect/test28.5
index dda201f53b0..1674a69c794 100755
--- a/testsuite/expect/test28.5
+++ b/testsuite/expect/test28.5
@@ -191,6 +191,5 @@ if {$job_id != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.6 b/testsuite/expect/test28.6
index 3849145b802..33a49c1de24 100755
--- a/testsuite/expect/test28.6
+++ b/testsuite/expect/test28.6
@@ -182,6 +182,5 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.7 b/testsuite/expect/test28.7
index 553370614c9..dcce46ab191 100755
--- a/testsuite/expect/test28.7
+++ b/testsuite/expect/test28.7
@@ -144,6 +144,5 @@ if {$match_job_state != $array_size} {
cancel_job $job_id
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.8 b/testsuite/expect/test28.8
index 85d283c7d0c..3e2bea01479 100755
--- a/testsuite/expect/test28.8
+++ b/testsuite/expect/test28.8
@@ -172,6 +172,5 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test28.9 b/testsuite/expect/test28.9
index de3667a19b4..ca753de3e4a 100755
--- a/testsuite/expect/test28.9
+++ b/testsuite/expect/test28.9
@@ -111,6 +111,5 @@ if {[cancel_job $job_id] != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_script
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test29.1 b/testsuite/expect/test29.1
index f376456b67c..559a1cdd420 100755
--- a/testsuite/expect/test29.1
+++ b/testsuite/expect/test29.1
@@ -51,7 +51,4 @@ if {$match != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test29.2 b/testsuite/expect/test29.2
index fd5fe2effba..0d77d6bd502 100755
--- a/testsuite/expect/test29.2
+++ b/testsuite/expect/test29.2
@@ -69,7 +69,4 @@ if {$match != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test29.3 b/testsuite/expect/test29.3
index a7c9c11fce2..f6546c83439 100755
--- a/testsuite/expect/test29.3
+++ b/testsuite/expect/test29.3
@@ -196,6 +196,5 @@ reset_state $node_name
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test29.4 b/testsuite/expect/test29.4
index 7b09edf9d8b..5d75bd17fd8 100755
--- a/testsuite/expect/test29.4
+++ b/testsuite/expect/test29.4
@@ -178,6 +178,5 @@ reset_state $node_name
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test29.5 b/testsuite/expect/test29.5
index 5eea37fea81..a0e73d8fd65 100755
--- a/testsuite/expect/test29.5
+++ b/testsuite/expect/test29.5
@@ -197,6 +197,5 @@ reset_state $node_name
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test29.6 b/testsuite/expect/test29.6
index c72238289ba..ecc7e6e7b3e 100755
--- a/testsuite/expect/test29.6
+++ b/testsuite/expect/test29.6
@@ -241,6 +241,5 @@ reset_state $node_name
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test29.7 b/testsuite/expect/test29.7
index 451a64903fd..35728ea4dc6 100755
--- a/testsuite/expect/test29.7
+++ b/testsuite/expect/test29.7
@@ -193,6 +193,5 @@ reset_state $node_name
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test29.8 b/testsuite/expect/test29.8
index 8f12cf64512..75fc4d910a6 100755
--- a/testsuite/expect/test29.8
+++ b/testsuite/expect/test29.8
@@ -214,7 +214,6 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test3.1 b/testsuite/expect/test3.1
index c765bc807e0..5a1db7c0c1e 100755
--- a/testsuite/expect/test3.1
+++ b/testsuite/expect/test3.1
@@ -92,6 +92,5 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test3.10 b/testsuite/expect/test3.10
index ee176ae9685..53f5332546f 100755
--- a/testsuite/expect/test3.10
+++ b/testsuite/expect/test3.10
@@ -187,7 +187,4 @@ if {$matches == 0} {
if {[cancel_job $job_id] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.11 b/testsuite/expect/test3.11
index b067e9ae0e6..c82bde6809b 100755
--- a/testsuite/expect/test3.11
+++ b/testsuite/expect/test3.11
@@ -473,7 +473,6 @@ inc3_11_10
inc3_11_11
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test3.12 b/testsuite/expect/test3.12
index 03becc81bab..11e62314b4f 100755
--- a/testsuite/expect/test3.12
+++ b/testsuite/expect/test3.12
@@ -189,7 +189,4 @@ if {$read_state != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.13 b/testsuite/expect/test3.13
index c13a6d6ffc3..f0512a5d9eb 100755
--- a/testsuite/expect/test3.13
+++ b/testsuite/expect/test3.13
@@ -188,7 +188,4 @@ if {$read_priority == 0} {
if {[cancel_job $job_id] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.14 b/testsuite/expect/test3.14
index 8980f9dd759..ec31a8bcf02 100755
--- a/testsuite/expect/test3.14
+++ b/testsuite/expect/test3.14
@@ -210,9 +210,7 @@ expect {
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test3.15 b/testsuite/expect/test3.15
index c85905dceab..6ad9541e8a0 100755
--- a/testsuite/expect/test3.15
+++ b/testsuite/expect/test3.15
@@ -332,10 +332,4 @@ cancel_job $job_id1
cancel_job $job_id2
restore_conf $config_file
reconfigure
-
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
- send_user "\nFAILURE\n"
-}
-exit $exit_code
+fail_on_error "Error restoring reconfiguration"
diff --git a/testsuite/expect/test3.16 b/testsuite/expect/test3.16
index 72317303893..7c413860ee2 100755
--- a/testsuite/expect/test3.16
+++ b/testsuite/expect/test3.16
@@ -143,7 +143,4 @@ delete_lic $lic_a
delete_lic $lic_b
delete_lic $lic_c
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.17 b/testsuite/expect/test3.17
index 2a06ac408e7..ecdfb126439 100755
--- a/testsuite/expect/test3.17
+++ b/testsuite/expect/test3.17
@@ -208,6 +208,5 @@ set_node_feature $node_name $orig_avail_node_feat $orig_active_node_feat
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test3.18 b/testsuite/expect/test3.18
index 8b35c74bd3e..f16af3c77d9 100755
--- a/testsuite/expect/test3.18
+++ b/testsuite/expect/test3.18
@@ -125,7 +125,4 @@ if {$matches != 1} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.2 b/testsuite/expect/test3.2
index 2e83c284398..518a6939e89 100755
--- a/testsuite/expect/test3.2
+++ b/testsuite/expect/test3.2
@@ -251,7 +251,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.3 b/testsuite/expect/test3.3
index 48b4486d9dd..8a153bf82f1 100755
--- a/testsuite/expect/test3.3
+++ b/testsuite/expect/test3.3
@@ -219,7 +219,4 @@ if {$read_state != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.4 b/testsuite/expect/test3.4
index 9c74cc43c0a..0eac69237d7 100755
--- a/testsuite/expect/test3.4
+++ b/testsuite/expect/test3.4
@@ -165,7 +165,4 @@ if {$validate_new_priority && ($read_priority != $new_prio)} {
if {[cancel_job $job_id] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.5 b/testsuite/expect/test3.5
index 409b9d1af72..84c2f21d412 100755
--- a/testsuite/expect/test3.5
+++ b/testsuite/expect/test3.5
@@ -444,7 +444,4 @@ if {$found != 0} {
exit 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test3.6 b/testsuite/expect/test3.6
index 684615a3895..b2f2a6eceb7 100755
--- a/testsuite/expect/test3.6
+++ b/testsuite/expect/test3.6
@@ -97,9 +97,6 @@ expect {
}
}
if {$found == 1} {
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- }
exit $exit_code
}
diff --git a/testsuite/expect/test3.7 b/testsuite/expect/test3.7
index b169d19f1d1..3bf07a4bf1c 100755
--- a/testsuite/expect/test3.7
+++ b/testsuite/expect/test3.7
@@ -259,7 +259,6 @@ if {$not_supported == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_out1 $file_out2 $file_prog $file_prog_sh1 $file_prog_sh2
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: May be due to use of gang scheduler, a race conditions, or the ProcTrack plugin not identifying the application as part of the job.\n"
}
diff --git a/testsuite/expect/test3.8 b/testsuite/expect/test3.8
index 1a366615a93..9d2a31f7427 100755
--- a/testsuite/expect/test3.8
+++ b/testsuite/expect/test3.8
@@ -260,6 +260,5 @@ if {[file exists $file_flag_2]} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
exec $bin_rm -f $file_flag_1 $file_flag_2 $file_flag_3 $file_flag_4
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test3.9 b/testsuite/expect/test3.9
index 5a34f5bb65d..faa7c25dee8 100755
--- a/testsuite/expect/test3.9
+++ b/testsuite/expect/test3.9
@@ -67,7 +67,4 @@ if {$matches != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test31.1 b/testsuite/expect/test31.1
index 4bc1d07689d..e669ff511b3 100755
--- a/testsuite/expect/test31.1
+++ b/testsuite/expect/test31.1
@@ -379,6 +379,5 @@ reconfigure
if {$exit_code == 0} {
exec $bin_rm -fr $config_dir/$inc_slurm $config_dir/$pro_epi_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test31.2 b/testsuite/expect/test31.2
index ffc9e4f7b78..7670376e558 100755
--- a/testsuite/expect/test31.2
+++ b/testsuite/expect/test31.2
@@ -274,6 +274,5 @@ cancel_job $job_id
if {$exit_code == 0} {
clean_up
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.1 b/testsuite/expect/test32.1
index b0aeda584de..3e69c38ebfd 100755
--- a/testsuite/expect/test32.1
+++ b/testsuite/expect/test32.1
@@ -60,7 +60,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test32.10 b/testsuite/expect/test32.10
index 64827edd1f1..01f4228be15 100755
--- a/testsuite/expect/test32.10
+++ b/testsuite/expect/test32.10
@@ -138,6 +138,5 @@ if {$file_cnt != [expr $node_cnt * 2]} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.11 b/testsuite/expect/test32.11
index c212cc3afe2..577906e4a9e 100755
--- a/testsuite/expect/test32.11
+++ b/testsuite/expect/test32.11
@@ -155,6 +155,5 @@ if {$rm_cnt != $node_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.12 b/testsuite/expect/test32.12
index 580b746f192..3cf2877fbe1 100755
--- a/testsuite/expect/test32.12
+++ b/testsuite/expect/test32.12
@@ -146,6 +146,5 @@ if {$rm_cnt != $node_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.2 b/testsuite/expect/test32.2
index 73a2a172a8b..c8758487a92 100755
--- a/testsuite/expect/test32.2
+++ b/testsuite/expect/test32.2
@@ -64,7 +64,4 @@ if {$matches != 2} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test32.3 b/testsuite/expect/test32.3
index 80eb3571242..d8648c9d176 100755
--- a/testsuite/expect/test32.3
+++ b/testsuite/expect/test32.3
@@ -63,7 +63,4 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test32.4 b/testsuite/expect/test32.4
index 74835521bb0..d189295ce30 100755
--- a/testsuite/expect/test32.4
+++ b/testsuite/expect/test32.4
@@ -145,6 +145,5 @@ if {$rm_cnt != $node_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.5 b/testsuite/expect/test32.5
index 97f5c896bc7..51686cb4908 100755
--- a/testsuite/expect/test32.5
+++ b/testsuite/expect/test32.5
@@ -141,6 +141,5 @@ if {$file_cnt != $node_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.6 b/testsuite/expect/test32.6
index 04ff944606b..581b100d7fe 100755
--- a/testsuite/expect/test32.6
+++ b/testsuite/expect/test32.6
@@ -146,6 +146,5 @@ if {$rm_cnt == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.7 b/testsuite/expect/test32.7
index 43ed7ee2c97..2cbf7c4c96e 100755
--- a/testsuite/expect/test32.7
+++ b/testsuite/expect/test32.7
@@ -129,6 +129,5 @@ if {$matches != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.8 b/testsuite/expect/test32.8
index 655c0a8d7aa..86066a53f05 100755
--- a/testsuite/expect/test32.8
+++ b/testsuite/expect/test32.8
@@ -146,6 +146,5 @@ if {$rm_cnt != $node_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test32.9 b/testsuite/expect/test32.9
index 672e6f6556d..6c423fdbf09 100755
--- a/testsuite/expect/test32.9
+++ b/testsuite/expect/test32.9
@@ -136,6 +136,5 @@ if {$matches != [expr $node_cnt * 2]} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test33.1 b/testsuite/expect/test33.1
index 70dc5a0287f..bfb34486e52 100755
--- a/testsuite/expect/test33.1
+++ b/testsuite/expect/test33.1
@@ -196,7 +196,6 @@ if {$cfgok != $cfgcount} {
send_user "\n\nFAILURE\n"
set exit_code 1
} else {
- send_user "\nSUCCESS\n"
file delete $test_prog
}
exit $exit_code
diff --git a/testsuite/expect/test34.1 b/testsuite/expect/test34.1
index 0f5e5ee0134..8356f44ff8c 100755
--- a/testsuite/expect/test34.1
+++ b/testsuite/expect/test34.1
@@ -369,6 +369,5 @@ clean_up 0
if {$exit_code == 0} {
exec $bin_rm $job1 $job2 $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test34.2 b/testsuite/expect/test34.2
index 75edcc15203..00d8e17914b 100755
--- a/testsuite/expect/test34.2
+++ b/testsuite/expect/test34.2
@@ -296,6 +296,5 @@ clean_up 0
if {$exit_code == 0} {
exec $bin_rm $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test35.1 b/testsuite/expect/test35.1
index cee710e4c76..40dc9928819 100755
--- a/testsuite/expect/test35.1
+++ b/testsuite/expect/test35.1
@@ -208,6 +208,5 @@ if {$job_id_rm == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $output_mk $output_rm $output_use
exec $bin_rm -f $script_mk $script_rm $script_use
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test35.2 b/testsuite/expect/test35.2
index 22dba48e856..cd7d5e6ad9b 100755
--- a/testsuite/expect/test35.2
+++ b/testsuite/expect/test35.2
@@ -177,6 +177,5 @@ if {[find_bb_data $output_data $data_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $input_data $output_data
exec $bin_rm -f $output_use $script_use
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test35.3 b/testsuite/expect/test35.3
index f3a6f603701..96c631f288c 100755
--- a/testsuite/expect/test35.3
+++ b/testsuite/expect/test35.3
@@ -183,6 +183,5 @@ if {$found != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $input_data $output_data $script_use
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test35.4 b/testsuite/expect/test35.4
index f6fde930b14..1ff24001423 100755
--- a/testsuite/expect/test35.4
+++ b/testsuite/expect/test35.4
@@ -195,6 +195,5 @@ if {$job_id_rm == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $output_use $script_mk $script_rm $script_use
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test35.5 b/testsuite/expect/test35.5
index 9a64edd1150..d3882a9ea73 100755
--- a/testsuite/expect/test35.5
+++ b/testsuite/expect/test35.5
@@ -147,7 +147,4 @@ if {$matches == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test35.6 b/testsuite/expect/test35.6
index 45b5a293fe8..d1d7d7edd27 100755
--- a/testsuite/expect/test35.6
+++ b/testsuite/expect/test35.6
@@ -111,6 +111,5 @@ if {$found == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $script_child $script_parent
exec $bin_rm -f $output_child $output_parent
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test36.1 b/testsuite/expect/test36.1
index dc5d05b47a4..59dbee63ba8 100755
--- a/testsuite/expect/test36.1
+++ b/testsuite/expect/test36.1
@@ -76,9 +76,7 @@ if {[string compare $control_machine $lsid_control_machine]} {
set exit_code 1
}
-if {!$exit_code} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code} {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test36.2 b/testsuite/expect/test36.2
index 222fc27ea07..e905e15bf23 100755
--- a/testsuite/expect/test36.2
+++ b/testsuite/expect/test36.2
@@ -123,7 +123,6 @@ cancel_job $job_id
if {$exit_code == 0} {
if {$job_found == 1} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: bjobs $job_id does not work\n"
exit 1
diff --git a/testsuite/expect/test36.3 b/testsuite/expect/test36.3
index 0f09afd6d0e..9baaa11cf0e 100755
--- a/testsuite/expect/test36.3
+++ b/testsuite/expect/test36.3
@@ -153,7 +153,6 @@ if {$state_match != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test36.4 b/testsuite/expect/test36.4
index 7a35b31c9c3..e597cd702dc 100755
--- a/testsuite/expect/test36.4
+++ b/testsuite/expect/test36.4
@@ -116,6 +116,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test38.10 b/testsuite/expect/test38.10
index 3be4bd53ad2..56326927a73 100755
--- a/testsuite/expect/test38.10
+++ b/testsuite/expect/test38.10
@@ -133,5 +133,4 @@ check $pack_job_id+2 7 1
check $pack_job_id+1 6 1
check $pack_job_id+0 5 1
-send_user "\nSUCCESS\n"
end_it 0
diff --git a/testsuite/expect/test38.11 b/testsuite/expect/test38.11
index 46fcab0ddb7..459c6463855 100755
--- a/testsuite/expect/test38.11
+++ b/testsuite/expect/test38.11
@@ -221,6 +221,5 @@ if {$matches != 4} {
if {$exit_code == 0} {
exec $bin_rm -rf $script1
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test38.12 b/testsuite/expect/test38.12
index 484a8e61b74..ba80ccceef1 100755
--- a/testsuite/expect/test38.12
+++ b/testsuite/expect/test38.12
@@ -277,5 +277,4 @@ expect {
}
}
-send_user "\nSUCCESS\n"
end_it 0
diff --git a/testsuite/expect/test38.14 b/testsuite/expect/test38.14
index f075c88f5e1..9130151b9c9 100755
--- a/testsuite/expect/test38.14
+++ b/testsuite/expect/test38.14
@@ -88,6 +88,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test38.15 b/testsuite/expect/test38.15
index cf4a2cf1bfa..664cc45d5c9 100755
--- a/testsuite/expect/test38.15
+++ b/testsuite/expect/test38.15
@@ -167,5 +167,4 @@ expect {
}
exec $bin_rm -f $file_in
-send_user "\nSUCCESS\n"
end_it 0
diff --git a/testsuite/expect/test38.16 b/testsuite/expect/test38.16
index 8ec992b51e4..cd77760b496 100755
--- a/testsuite/expect/test38.16
+++ b/testsuite/expect/test38.16
@@ -241,5 +241,4 @@ if {$matches != 2} {
}
exec $bin_rm -f $file_in $file_out
-send_user "\nSUCCESS\n"
end_it 0
diff --git a/testsuite/expect/test38.7 b/testsuite/expect/test38.7
index 21d182ccddf..2228a8728ca 100755
--- a/testsuite/expect/test38.7
+++ b/testsuite/expect/test38.7
@@ -580,7 +580,6 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_err $test_prog ${test_prog}.o
- send_user "\nSUCCESS\n"
} else {
set matches 0
spawn head $file_err
diff --git a/testsuite/expect/test38.8 b/testsuite/expect/test38.8
index d0693c9ddbd..f7617f681fd 100755
--- a/testsuite/expect/test38.8
+++ b/testsuite/expect/test38.8
@@ -180,5 +180,4 @@ for {set inx 0} {$inx < 3} {incr inx} {
}
}
-send_user "\nSUCCESS\n"
end_it 0
diff --git a/testsuite/expect/test38.9 b/testsuite/expect/test38.9
index 5b09350ac6c..d06042ce525 100755
--- a/testsuite/expect/test38.9
+++ b/testsuite/expect/test38.9
@@ -306,5 +306,4 @@ if { $matches != 1} {
send "exit\r"
-send_user "\nSUCCESS\n"
exit 0
diff --git a/testsuite/expect/test39.1 b/testsuite/expect/test39.1
index 95b41ae6020..36cf8e5f117 100755
--- a/testsuite/expect/test39.1
+++ b/testsuite/expect/test39.1
@@ -209,6 +209,5 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.10 b/testsuite/expect/test39.10
index a7f03b706c2..2a453ab6f2b 100755
--- a/testsuite/expect/test39.10
+++ b/testsuite/expect/test39.10
@@ -276,6 +276,5 @@ if {$gpu_cnt > 1 && $nb_nodes > 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.11 b/testsuite/expect/test39.11
index beb7944bd83..349263e4fad 100755
--- a/testsuite/expect/test39.11
+++ b/testsuite/expect/test39.11
@@ -144,6 +144,5 @@ if {0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.12 b/testsuite/expect/test39.12
index 97c60c61353..6b5226ac27e 100755
--- a/testsuite/expect/test39.12
+++ b/testsuite/expect/test39.12
@@ -344,6 +344,5 @@ if {$match_gpu != $expected_gpus} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.13 b/testsuite/expect/test39.13
index a0788103048..08c6fc4daac 100755
--- a/testsuite/expect/test39.13
+++ b/testsuite/expect/test39.13
@@ -183,6 +183,5 @@ exec $scancel -n "test$test_id"
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.14 b/testsuite/expect/test39.14
index 6ca9515d5f3..47953daa2de 100755
--- a/testsuite/expect/test39.14
+++ b/testsuite/expect/test39.14
@@ -221,6 +221,5 @@ if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_in3 $file_out1 $file_out2
exec $bin_rm -f slurm_job_${job_id2}_resize.csh
exec $bin_rm -f slurm_job_${job_id2}_resize.sh
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.15 b/testsuite/expect/test39.15
index 4589ed2e0df..9b481c84245 100755
--- a/testsuite/expect/test39.15
+++ b/testsuite/expect/test39.15
@@ -115,6 +115,5 @@ if {$match != $nb_tasks} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.16 b/testsuite/expect/test39.16
index e938087062c..3818c629848 100755
--- a/testsuite/expect/test39.16
+++ b/testsuite/expect/test39.16
@@ -110,6 +110,5 @@ if {$match != $nb_tasks} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.17 b/testsuite/expect/test39.17
index 571d9c2eccb..7fae99cfb11 100755
--- a/testsuite/expect/test39.17
+++ b/testsuite/expect/test39.17
@@ -1134,6 +1134,5 @@ if {$gpu_cnt > 3 && $nb_nodes >= 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.18 b/testsuite/expect/test39.18
index d4101ea79c9..7a66bcdae16 100755
--- a/testsuite/expect/test39.18
+++ b/testsuite/expect/test39.18
@@ -1856,9 +1856,7 @@ check_configuration 2.56 $slurm_conf_gres $gres_conf $fake_gpus_conf $expected_o
# # Cleanup and finish
# ##############################################################################
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "FAILURE: Tests $test_id.\["
set length [llength $failed_tests]
set i 0
diff --git a/testsuite/expect/test39.19 b/testsuite/expect/test39.19
index 395a5d36133..27d27769b7f 100755
--- a/testsuite/expect/test39.19
+++ b/testsuite/expect/test39.19
@@ -678,6 +678,5 @@ test_acct $job_id $job_tasks $step_tasks $have_gpu_types
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.2 b/testsuite/expect/test39.2
index 7be400b776d..b5936174af7 100755
--- a/testsuite/expect/test39.2
+++ b/testsuite/expect/test39.2
@@ -167,6 +167,5 @@ if {$match != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.20 b/testsuite/expect/test39.20
index 03e7b247f64..ef428a17567 100755
--- a/testsuite/expect/test39.20
+++ b/testsuite/expect/test39.20
@@ -432,6 +432,5 @@ cleanup
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out1 $file_out2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.21 b/testsuite/expect/test39.21
index a23f77b4fda..e21bc3dfc59 100755
--- a/testsuite/expect/test39.21
+++ b/testsuite/expect/test39.21
@@ -122,6 +122,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.22 b/testsuite/expect/test39.22
index be6b89cdfd9..6ab304d3d92 100755
--- a/testsuite/expect/test39.22
+++ b/testsuite/expect/test39.22
@@ -105,6 +105,5 @@ if {$match != 2} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.23 b/testsuite/expect/test39.23
index e28efa6cfe8..349a3b7d0f4 100755
--- a/testsuite/expect/test39.23
+++ b/testsuite/expect/test39.23
@@ -298,6 +298,5 @@ if {$gpu_cnt > 1 && $num_cpus > 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.3 b/testsuite/expect/test39.3
index 051768cd79a..1dc59eff922 100755
--- a/testsuite/expect/test39.3
+++ b/testsuite/expect/test39.3
@@ -172,6 +172,5 @@ if {$match != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.4 b/testsuite/expect/test39.4
index 4884ae68118..79215920f0e 100755
--- a/testsuite/expect/test39.4
+++ b/testsuite/expect/test39.4
@@ -200,7 +200,4 @@ expect {
}
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test39.5 b/testsuite/expect/test39.5
index 308392381dd..f36729e487f 100755
--- a/testsuite/expect/test39.5
+++ b/testsuite/expect/test39.5
@@ -340,6 +340,5 @@ if {$match != $expected_gpus} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.6 b/testsuite/expect/test39.6
index 7dfde0cd91b..a3af2b83615 100755
--- a/testsuite/expect/test39.6
+++ b/testsuite/expect/test39.6
@@ -194,6 +194,5 @@ if {$match != $gpu_cnt} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.7 b/testsuite/expect/test39.7
index 21ccda76708..a2b3bf637c2 100755
--- a/testsuite/expect/test39.7
+++ b/testsuite/expect/test39.7
@@ -227,6 +227,5 @@ if {$gpu_cnt > 1 && $nb_nodes > 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.8 b/testsuite/expect/test39.8
index 633f0ccedd0..1b138af1081 100755
--- a/testsuite/expect/test39.8
+++ b/testsuite/expect/test39.8
@@ -210,6 +210,5 @@ if {$matches != $match_goal} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test39.9 b/testsuite/expect/test39.9
index 91b40f67b5f..3243ec79dc9 100755
--- a/testsuite/expect/test39.9
+++ b/testsuite/expect/test39.9
@@ -269,7 +269,6 @@ if {$match != 1} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
print_time
diff --git a/testsuite/expect/test4.1 b/testsuite/expect/test4.1
index 77f6e4f8d59..950af323f01 100755
--- a/testsuite/expect/test4.1
+++ b/testsuite/expect/test4.1
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: sinfo failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.10 b/testsuite/expect/test4.10
index 16370c1602d..9c510f67d44 100755
--- a/testsuite/expect/test4.10
+++ b/testsuite/expect/test4.10
@@ -61,7 +61,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper sinfo version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.11 b/testsuite/expect/test4.11
index 9a05dcdbaef..15521856bfb 100755
--- a/testsuite/expect/test4.11
+++ b/testsuite/expect/test4.11
@@ -65,7 +65,4 @@ if {$matches == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.12 b/testsuite/expect/test4.12
index 580a5fde610..518157bac64 100755
--- a/testsuite/expect/test4.12
+++ b/testsuite/expect/test4.12
@@ -419,8 +419,4 @@ if {!$exit_code && $smallest != $inode_procs} {
sleep 1
set exit_code [allocate_and_quit $inode_name $inode_procs $inode_procs]
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
- exit $exit_code
-}
+exit $exit_code
diff --git a/testsuite/expect/test4.13 b/testsuite/expect/test4.13
index 248361121ad..3c530bbe574 100755
--- a/testsuite/expect/test4.13
+++ b/testsuite/expect/test4.13
@@ -244,9 +244,7 @@ foreach option [array names part_sinfo_vals] {
cleanup
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test4.14 b/testsuite/expect/test4.14
index 86e02d0ad8f..ab703303c54 100755
--- a/testsuite/expect/test4.14
+++ b/testsuite/expect/test4.14
@@ -299,8 +299,4 @@ if {$match != 1} {
# Delete test partitions
delete_part
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
-
exit $exit_code
diff --git a/testsuite/expect/test4.2 b/testsuite/expect/test4.2
index 5fd744acee5..a97829a9cb0 100755
--- a/testsuite/expect/test4.2
+++ b/testsuite/expect/test4.2
@@ -65,7 +65,4 @@ if {$matches != 2} {
send_user "\nFAILURE: sinfo failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.3 b/testsuite/expect/test4.3
index 798fa1b304c..78496c8b231 100755
--- a/testsuite/expect/test4.3
+++ b/testsuite/expect/test4.3
@@ -261,7 +261,4 @@ if {$matches != 10} {
send_user "\nFAILURE: sinfo partition long format error\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.4 b/testsuite/expect/test4.4
index 22ed1ab02fb..207a189e543 100755
--- a/testsuite/expect/test4.4
+++ b/testsuite/expect/test4.4
@@ -144,7 +144,4 @@ if {$matches != 6} {
send_user "\nFAILURE: sinfo node long format error\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.5 b/testsuite/expect/test4.5
index 45a36885fc0..9ca42199b4b 100755
--- a/testsuite/expect/test4.5
+++ b/testsuite/expect/test4.5
@@ -305,6 +305,5 @@ if {$mismatches != 0} {
}
if {$exit_code == 0} {
file delete $tmp_sc
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test4.6 b/testsuite/expect/test4.6
index ca679c3ba4d..8c57f6c258e 100755
--- a/testsuite/expect/test4.6
+++ b/testsuite/expect/test4.6
@@ -65,7 +65,4 @@ if {$iteration < 3} {
send_user "\nFAILURE: sinfo iteration error\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.7 b/testsuite/expect/test4.7
index 641ab397dee..9bd809467da 100755
--- a/testsuite/expect/test4.7
+++ b/testsuite/expect/test4.7
@@ -69,7 +69,4 @@ if {$matches != 2} {
send_user "\nFAILURE: sinfo failed to process verbose option\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.8 b/testsuite/expect/test4.8
index 8d1dfba5c55..0fa838185ad 100755
--- a/testsuite/expect/test4.8
+++ b/testsuite/expect/test4.8
@@ -122,7 +122,4 @@ if {$matches != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test4.9 b/testsuite/expect/test4.9
index 6c401a4141f..a8de47218a9 100755
--- a/testsuite/expect/test4.9
+++ b/testsuite/expect/test4.9
@@ -93,8 +93,5 @@ if {$matches == 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test40.1 b/testsuite/expect/test40.1
index 1b310753039..765292117d8 100755
--- a/testsuite/expect/test40.1
+++ b/testsuite/expect/test40.1
@@ -114,7 +114,4 @@ expect {
# The tests already exist in src/common/gres.c to reject such jobs
#
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test40.2 b/testsuite/expect/test40.2
index d4ddb4999ac..05965c6195a 100755
--- a/testsuite/expect/test40.2
+++ b/testsuite/expect/test40.2
@@ -585,6 +585,5 @@ if {[test_front_end] == 0} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out1 $file_out2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test40.3 b/testsuite/expect/test40.3
index cdb5c9defd1..f94756f4a2f 100755
--- a/testsuite/expect/test40.3
+++ b/testsuite/expect/test40.3
@@ -351,6 +351,5 @@ test_acct $job_id $target $target $have_mps_types
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test40.4 b/testsuite/expect/test40.4
index 17273f52b7c..b9a528b0085 100755
--- a/testsuite/expect/test40.4
+++ b/testsuite/expect/test40.4
@@ -241,6 +241,5 @@ cleanup
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out1 $file_out2
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test40.5 b/testsuite/expect/test40.5
index bdc943ab298..5bbc88f24dd 100755
--- a/testsuite/expect/test40.5
+++ b/testsuite/expect/test40.5
@@ -264,6 +264,5 @@ if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_in3 $file_out1 $file_out2
exec $bin_rm -f slurm_job_${job_id2}_resize.csh
exec $bin_rm -f slurm_job_${job_id2}_resize.sh
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test40.6 b/testsuite/expect/test40.6
index 7ba25f87395..3235feb280c 100755
--- a/testsuite/expect/test40.6
+++ b/testsuite/expect/test40.6
@@ -183,6 +183,5 @@ if {$exit_code == 0 && $constrain_devices == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in1 $file_in2 $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test40.8 b/testsuite/expect/test40.8
index 5c6b203d583..ad2436bc33d 100755
--- a/testsuite/expect/test40.8
+++ b/testsuite/expect/test40.8
@@ -192,6 +192,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test5.1 b/testsuite/expect/test5.1
index 9347de1d6ff..ff6f4c63fa0 100755
--- a/testsuite/expect/test5.1
+++ b/testsuite/expect/test5.1
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: squeue failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.10 b/testsuite/expect/test5.10
index a4ed8d53247..ca9e5203b27 100755
--- a/testsuite/expect/test5.10
+++ b/testsuite/expect/test5.10
@@ -331,7 +331,6 @@ delete_part $test_part_2
if {$exit_code == 0} {
exec $bin_rm $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test5.11 b/testsuite/expect/test5.11
index 328dfefdb91..f96cc12f831 100755
--- a/testsuite/expect/test5.11
+++ b/testsuite/expect/test5.11
@@ -278,9 +278,7 @@ if {$cpu_l_cnt == $cpu_h_cnt} {
each with different cpu counts -- finishing test now."
exec $bin_rm -fr $script
- if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- } else {
+ if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
@@ -384,9 +382,7 @@ expect {
}
exec $bin_rm -fr $script
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test5.2 b/testsuite/expect/test5.2
index 9eb73f6e32f..c125af0ee36 100755
--- a/testsuite/expect/test5.2
+++ b/testsuite/expect/test5.2
@@ -65,7 +65,4 @@ if {$matches != 2} {
send_user "\nFAILURE: squeue failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.3 b/testsuite/expect/test5.3
index 68f01610ca2..4e3ad8668de 100755
--- a/testsuite/expect/test5.3
+++ b/testsuite/expect/test5.3
@@ -73,7 +73,4 @@ if {$iteration < 3} {
send_user "\nFAILURE: squeue iteration error\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.4 b/testsuite/expect/test5.4
index c88719f30a1..a7958a2036e 100755
--- a/testsuite/expect/test5.4
+++ b/testsuite/expect/test5.4
@@ -241,8 +241,5 @@ if {[cancel_job $job_id1] != 0} {
if {[cancel_job $job_id2] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.5 b/testsuite/expect/test5.5
index b4883302afc..13f105ddb61 100755
--- a/testsuite/expect/test5.5
+++ b/testsuite/expect/test5.5
@@ -125,8 +125,5 @@ if {[cancel_job $job_id1] != 0} {
if {[cancel_job $job_id2] != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.6 b/testsuite/expect/test5.6
index 92fc8d865b2..55a0437ba69 100755
--- a/testsuite/expect/test5.6
+++ b/testsuite/expect/test5.6
@@ -408,7 +408,6 @@ if {[cancel_job $job_id2] != 0} {
set exit_code 1
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in
}
exit $exit_code
diff --git a/testsuite/expect/test5.7 b/testsuite/expect/test5.7
index 899fbadf780..1c3a2ed843c 100755
--- a/testsuite/expect/test5.7
+++ b/testsuite/expect/test5.7
@@ -69,7 +69,4 @@ if {$matches != 2} {
send_user "\nFAILURE: squeue failed to process verbose option\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.8 b/testsuite/expect/test5.8
index d327eda47b4..ac27c62f7fb 100755
--- a/testsuite/expect/test5.8
+++ b/testsuite/expect/test5.8
@@ -61,7 +61,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper squeue version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test5.9 b/testsuite/expect/test5.9
index 604c2df633b..75d60ea257c 100755
--- a/testsuite/expect/test5.9
+++ b/testsuite/expect/test5.9
@@ -464,7 +464,6 @@ remove_acct "" $test_acct
if {$exit_code == 0} {
exec $bin_rm -f $file_err $file_out $file_in
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE\n"
}
diff --git a/testsuite/expect/test6.1 b/testsuite/expect/test6.1
index 698b102ee4d..86a732d1623 100755
--- a/testsuite/expect/test6.1
+++ b/testsuite/expect/test6.1
@@ -61,7 +61,4 @@ if {$matches != 1} {
send_user "\nFAILURE: scancel failed to report usage format\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test6.10 b/testsuite/expect/test6.10
index e9591026228..ae0c184a15a 100755
--- a/testsuite/expect/test6.10
+++ b/testsuite/expect/test6.10
@@ -181,6 +181,5 @@ if {$matches != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.11 b/testsuite/expect/test6.11
index a8292d6e105..cf5e3b0b9b9 100755
--- a/testsuite/expect/test6.11
+++ b/testsuite/expect/test6.11
@@ -125,6 +125,5 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.12 b/testsuite/expect/test6.12
index e6d67dc2678..f5853faf1bb 100755
--- a/testsuite/expect/test6.12
+++ b/testsuite/expect/test6.12
@@ -310,7 +310,6 @@ if {[cancel_job $job_id] != 0} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_out $file_err
}
exit $exit_code
diff --git a/testsuite/expect/test6.13 b/testsuite/expect/test6.13
index 0f104e597da..f67e4770e10 100755
--- a/testsuite/expect/test6.13
+++ b/testsuite/expect/test6.13
@@ -270,6 +270,5 @@ if {[wait_for_file $file_out] == 0} {
if {$exit_code == 0} {
exec rm -f $file_in $file_out $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.14 b/testsuite/expect/test6.14
index 401be52e0e1..deffdabd113 100755
--- a/testsuite/expect/test6.14
+++ b/testsuite/expect/test6.14
@@ -186,11 +186,8 @@ foreach job_id $submitted_jobs {
}
}
-
-
if {$exit_code == 0} {
exec rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.16 b/testsuite/expect/test6.16
index f4eb2e60e93..256a4419cf1 100755
--- a/testsuite/expect/test6.16
+++ b/testsuite/expect/test6.16
@@ -116,6 +116,5 @@ if {$matches != 3} {
if {$exit_code == 0} {
exec rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.17 b/testsuite/expect/test6.17
index 5f8c87adbff..716e5a1fa14 100755
--- a/testsuite/expect/test6.17
+++ b/testsuite/expect/test6.17
@@ -107,9 +107,7 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.2 b/testsuite/expect/test6.2
index cb756ee597e..47adf29ea6c 100755
--- a/testsuite/expect/test6.2
+++ b/testsuite/expect/test6.2
@@ -65,7 +65,4 @@ if {$matches != 2} {
send_user "\nFAILURE: scancel failed to report help message\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test6.3 b/testsuite/expect/test6.3
index ae363f7624d..4bb22a09a21 100755
--- a/testsuite/expect/test6.3
+++ b/testsuite/expect/test6.3
@@ -137,7 +137,6 @@ if {$matches != 3} {
}
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.4 b/testsuite/expect/test6.4
index f3536a8f91b..41b635e2138 100755
--- a/testsuite/expect/test6.4
+++ b/testsuite/expect/test6.4
@@ -138,9 +138,7 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.5 b/testsuite/expect/test6.5
index 5a1b5765292..50e0a2a5d88 100755
--- a/testsuite/expect/test6.5
+++ b/testsuite/expect/test6.5
@@ -135,7 +135,4 @@ if {$matches != 0} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test6.6 b/testsuite/expect/test6.6
index 2ac0afdb3f3..cef7003b587 100755
--- a/testsuite/expect/test6.6
+++ b/testsuite/expect/test6.6
@@ -61,7 +61,4 @@ if {$version != 1} {
send_user "\nFAILURE: Did not get proper scancel version number\n"
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test6.7 b/testsuite/expect/test6.7
index d102bbfe456..06462cf6b0e 100755
--- a/testsuite/expect/test6.7
+++ b/testsuite/expect/test6.7
@@ -261,7 +261,6 @@ if {[wait_for_file $file_out2] == 0} {
if {$exit_code == 0} {
exec rm -f $file_in $file_out2 $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.8 b/testsuite/expect/test6.8
index 344f7e3df62..0c8d952950e 100755
--- a/testsuite/expect/test6.8
+++ b/testsuite/expect/test6.8
@@ -157,9 +157,7 @@ if {$matches != 1} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE\n"
}
exit $exit_code
diff --git a/testsuite/expect/test6.9 b/testsuite/expect/test6.9
index 1512cb3f306..66a81286371 100755
--- a/testsuite/expect/test6.9
+++ b/testsuite/expect/test6.9
@@ -130,6 +130,5 @@ if {$matches != 1} {
if {$exit_code == 0} {
exec rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.1 b/testsuite/expect/test7.1
index 6b62d5161bb..bd87a140dd6 100755
--- a/testsuite/expect/test7.1
+++ b/testsuite/expect/test7.1
@@ -194,6 +194,5 @@ if {$prio3 != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.10 b/testsuite/expect/test7.10
index 94f24efd10b..2839f6a4522 100755
--- a/testsuite/expect/test7.10
+++ b/testsuite/expect/test7.10
@@ -88,6 +88,5 @@ expect {
if {$exit_code == 0} {
exec $bin_rm -f ${ld_preload}.c ${ld_preload}.lo ${ld_preload}.so
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.12 b/testsuite/expect/test7.12
index 12714e0841e..3c61c7089b0 100755
--- a/testsuite/expect/test7.12
+++ b/testsuite/expect/test7.12
@@ -147,6 +147,5 @@ if {$job_matches != 1} {
cancel_job $job_id
if {$exit_code == 0} {
file delete $file_in $test_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.13 b/testsuite/expect/test7.13
index 774599b4ee5..b263c7230fd 100755
--- a/testsuite/expect/test7.13
+++ b/testsuite/expect/test7.13
@@ -274,7 +274,6 @@ if { [test_account_storage] == 1 } {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_prog1 $file_prog2
}
diff --git a/testsuite/expect/test7.14 b/testsuite/expect/test7.14
index 3196c68f359..6679aae554b 100755
--- a/testsuite/expect/test7.14
+++ b/testsuite/expect/test7.14
@@ -175,7 +175,6 @@ if {$matches != 1} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_in $file_prog1 $file_prog2
}
diff --git a/testsuite/expect/test7.15 b/testsuite/expect/test7.15
index f946333ad9c..8dbda0559ef 100755
--- a/testsuite/expect/test7.15
+++ b/testsuite/expect/test7.15
@@ -98,7 +98,6 @@ expect {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
exec $bin_rm -f $file_prog
}
diff --git a/testsuite/expect/test7.16 b/testsuite/expect/test7.16
index 9ef1ed92c8f..7dcda933216 100755
--- a/testsuite/expect/test7.16
+++ b/testsuite/expect/test7.16
@@ -106,8 +106,5 @@ if {$job_id != 0} {
}
}
-if { $exit_code == 0 } {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test7.17 b/testsuite/expect/test7.17
index f908f3db741..fbb1ad5bd26 100755
--- a/testsuite/expect/test7.17
+++ b/testsuite/expect/test7.17
@@ -200,7 +200,6 @@ if {$fail_match != 1} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
file delete $test_prog
}
exit $exit_code
diff --git a/testsuite/expect/test7.18 b/testsuite/expect/test7.18
index adc73ad18fa..58da94c7642 100755
--- a/testsuite/expect/test7.18
+++ b/testsuite/expect/test7.18
@@ -62,7 +62,6 @@ expect {
if { $exit_code == 0 } {
file delete $test_prog
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: One or more hosts weren't found.\n"
}
diff --git a/testsuite/expect/test7.19 b/testsuite/expect/test7.19
index 416023216fd..86cbb751677 100755
--- a/testsuite/expect/test7.19
+++ b/testsuite/expect/test7.19
@@ -218,6 +218,4 @@ if { [test_srun 1] } {
#cleanup
exec $bin_rm $file_in
-send_user "\nSUCCESS\n"
-
exit 0
diff --git a/testsuite/expect/test7.2 b/testsuite/expect/test7.2
index 47cb99ae91d..e8307471243 100755
--- a/testsuite/expect/test7.2
+++ b/testsuite/expect/test7.2
@@ -113,8 +113,6 @@ expect {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- exec $bin_rm -f $file_prog_get
-
+ exec $bin_rm -f $file_prog_get
}
exit $exit_code
diff --git a/testsuite/expect/test7.3 b/testsuite/expect/test7.3
index b29059ed60b..362f2dd54b3 100755
--- a/testsuite/expect/test7.3
+++ b/testsuite/expect/test7.3
@@ -125,6 +125,5 @@ if {$matches != [expr $task_cnt * 3]} {
if {$exit_code == 0} {
file delete $io_prog $test_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.4 b/testsuite/expect/test7.4
index e79bdc65e9b..d82b5bcbd10 100755
--- a/testsuite/expect/test7.4
+++ b/testsuite/expect/test7.4
@@ -260,6 +260,5 @@ if {$matches != 12} {
if {$exit_code == 0} {
exec $bin_rm -f $test_prog ${test_prog}.o ${test_prog}.TVD.v3breakpoints ${test_prog}.TVD.v3breakpoints~
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.5 b/testsuite/expect/test7.5
index 02fcd71b7c2..252bb6da4cb 100755
--- a/testsuite/expect/test7.5
+++ b/testsuite/expect/test7.5
@@ -193,6 +193,5 @@ if {$fini_cnt > 0} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_prog
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.6 b/testsuite/expect/test7.6
index d9404de4b1c..99bcb3398a3 100755
--- a/testsuite/expect/test7.6
+++ b/testsuite/expect/test7.6
@@ -204,6 +204,5 @@ cancel_job $job_id
if {$exit_code == 0} {
exec $bin_rm -f $test_prog ${test_prog}.o ${test_prog}.TVD.v3breakpoints
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.7 b/testsuite/expect/test7.7
index 485c5f031cb..d1409decaaa 100755
--- a/testsuite/expect/test7.7
+++ b/testsuite/expect/test7.7
@@ -205,6 +205,5 @@ for {set inx 1} {$inx < $max_tasks && $exit_code == 0} {incr inx} {
#
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test7.9 b/testsuite/expect/test7.9
index f0a25ba9050..f6be4d4d299 100755
--- a/testsuite/expect/test7.9
+++ b/testsuite/expect/test7.9
@@ -148,8 +148,6 @@ if {$matches != 0} {
}
if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
- exec $bin_rm -f $file_in $file_prog $file_out
-
+ exec $bin_rm -f $file_in $file_prog $file_out
}
exit $exit_code
diff --git a/testsuite/expect/test9.1 b/testsuite/expect/test9.1
index 7a941740012..60aed0ea32a 100755
--- a/testsuite/expect/test9.1
+++ b/testsuite/expect/test9.1
@@ -114,7 +114,6 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: Only $success_cnt of $cycle_count"
send_user " copy tests passed\n"
diff --git a/testsuite/expect/test9.2 b/testsuite/expect/test9.2
index a484aeb32fb..892b07b7b7c 100755
--- a/testsuite/expect/test9.2
+++ b/testsuite/expect/test9.2
@@ -105,7 +105,6 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
if {$exit_code == 0} {
exec $bin_rm -f $file_out
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: Only $success_cnt of $cycle_count"
send_user " hostname output tests passed\n"
diff --git a/testsuite/expect/test9.3 b/testsuite/expect/test9.3
index 50628ee78d1..05de03ffbf2 100755
--- a/testsuite/expect/test9.3
+++ b/testsuite/expect/test9.3
@@ -114,7 +114,6 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: Only $success_cnt of $cycle_count I/O"
send_user " tests passed\n"
diff --git a/testsuite/expect/test9.4 b/testsuite/expect/test9.4
index ee6e6f98fa1..fe2891ccf2f 100755
--- a/testsuite/expect/test9.4
+++ b/testsuite/expect/test9.4
@@ -153,9 +153,7 @@ for {set tsk 0} {$tsk < $task_cnt} {incr tsk} {
exec $bin_rm -f $file_in_glob $file_out_glob
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE: Only $success_cnt of "
send_user "[expr $cycle_count * $task_cnt] task I/O tests passed\n"
}
diff --git a/testsuite/expect/test9.5 b/testsuite/expect/test9.5
index 47081be8c92..b20237e00a0 100755
--- a/testsuite/expect/test9.5
+++ b/testsuite/expect/test9.5
@@ -136,9 +136,7 @@ for {set tsk 0} {$tsk < $task_cnt} {incr tsk} {
exec $bin_rm -f $file_in_glob
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-} else {
+if {$exit_code != 0} {
send_user "\nFAILURE: Only $success_cnt of "
send_user "$cycle_count task I/O tests passed\n"
}
diff --git a/testsuite/expect/test9.6 b/testsuite/expect/test9.6
index 034157a139d..efce08fd2b6 100755
--- a/testsuite/expect/test9.6
+++ b/testsuite/expect/test9.6
@@ -114,7 +114,6 @@ for {set inx 0} {$inx < $cycle_count} {incr inx} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in $file_out
- send_user "\nSUCCESS\n"
} else {
send_user "\nFAILURE: Only $success_cnt of $cycle_count hostname"
send_user " output tests passed\n"
diff --git a/testsuite/expect/test9.7 b/testsuite/expect/test9.7
index a165f0a7084..6c6aca8c8ed 100755
--- a/testsuite/expect/test9.7
+++ b/testsuite/expect/test9.7
@@ -83,7 +83,4 @@ if {$success_cnt != $task_cnt} {
set exit_code 1
}
-if {$exit_code == 0} {
- send_user "\nSUCCESS\n"
-}
exit $exit_code
diff --git a/testsuite/expect/test9.8 b/testsuite/expect/test9.8
index bd8fa1b79b0..12c099da293 100755
--- a/testsuite/expect/test9.8
+++ b/testsuite/expect/test9.8
@@ -275,6 +275,5 @@ if {$completing_jobs != 0} {
if {$exit_code == 0} {
exec $bin_rm -f $file_in
- send_user "\nSUCCESS\n"
}
exit $exit_code
diff --git a/testsuite/expect/test9.9 b/testsuite/expect/test9.9
index 6acd4bd7e85..f048f3b6474 100755
--- a/testsuite/expect/test9.9
+++ b/testsuite/expect/test9.9
@@ -82,9 +82,4 @@ set time_took [string trim [time {_submit_jobs "test$test_id" "/dev/null"}] " pe
set jobs_per_sec [expr $job_cnt * 1000000 / $time_took]
send_user "Ran $job_cnt jobs in $time_took microseconds or $jobs_per_sec jobs per second\n"
-if { $exit_code != 0 } {
- exit $exit_code
-}
-
-send_user "\nSUCCESS\n"
exit $exit_code
--
GitLab