Skip to content

Commit cd1e85b

Browse files
okorachokorach
committed
Simplify output file path
1 parent 7f0f00b commit cd1e85b

File tree

2 files changed

+43
-43
lines changed

2 files changed

+43
-43
lines changed

‎test/it.sh‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -105,55 +105,55 @@ do
105105
export SONAR_HOST_URL="http://localhost:$sqport"
106106
fi
107107

108-
f="$TMP/measures-$env-unrel.csv"; run_test "$f" sonar-measures-export -b -f "$f" -m _main --withURL
109-
f="$TMP/measures-$env-2.csv"; run_test_stdout "$f" sonar-measures-export -b -m _main --withURL
110-
f="$TMP/measures-$env-3.csv"; run_test_stdout "$f" sonar-measures-export -b -p -r -d -m _all
108+
f="measures-$env-unrel.csv"; run_test "$f" sonar-measures-export -b -f "$f" -m _main --withURL
109+
f="measures-$env-2.csv"; run_test_stdout "$f" sonar-measures-export -b -m _main --withURL
110+
f="measures-$env-3.csv"; run_test_stdout "$f" sonar-measures-export -b -p -r -d -m _all
111111

112-
f="$TMP/measures-$env-1.json"; run_test "$f" sonar-measures-export -b -f "$f" -m _all
113-
f="$TMP/measures-$env-2.json"; run_test_stdout "$f" sonar-measures-export -b -p -r -d -m _all --format json
114-
f="$TMP/measures-$env-3.csv"; run_test "$f" sonar-measures-export -b -f "$f" --csvSeparator '+' -m _main
112+
f="measures-$env-1.json"; run_test "$f" sonar-measures-export -b -f "$f" -m _all
113+
f="measures-$env-2.json"; run_test_stdout "$f" sonar-measures-export -b -p -r -d -m _all --format json
114+
f="measures-$env-3.csv"; run_test "$f" sonar-measures-export -b -f "$f" --csvSeparator '+' -m _main
115115

116-
f="$TMP/measures-history-$env-1.csv"; run_test "$f" sonar-measures-export -b -f "$f" --history
117-
f="$TMP/measures-history-$env-2.csv"; run_test "$f" sonar-measures-export -b -f "$f" -k okorach_sonar-tools --history --asTable
118-
f="$TMP/measures-history-$env-3.json"; run_test "$f" sonar-measures-export -b -f "$f" --history
116+
f="measures-history-$env-1.csv"; run_test "$f" sonar-measures-export -b -f "$f" --history
117+
f="measures-history-$env-2.csv"; run_test "$f" sonar-measures-export -b -f "$f" -k okorach_sonar-tools --history --asTable
118+
f="measures-history-$env-3.json"; run_test "$f" sonar-measures-export -b -f "$f" --history
119119

120120
logmsg "IT $env sonar-findings-export"
121121

122-
f="$TMP/findings-$env-unrel.csv"; run_test "$f" sonar-findings-export -v DEBUG -f "$f"
123-
f="$TMP/findings-$env-1.json"; run_test "$f" sonar-findings-export -f "$f"
124-
f="$TMP/findings-$env-2.json"; run_test_stdout "$f" sonar-findings-export -v DEBUG --format json -k okorach_audio-video-tools,okorach_sonar-tools
125-
f="$TMP/findings-$env-3.json"; run_test_stdout "$f" sonar-findings-export -v DEBUG --format json -k okorach_audio-video-tools,okorach_sonar-tools --useFindings
126-
f="$TMP/findings-$env-4.csv"; run_test_stdout "$f" sonar-findings-export --format csv -k okorach_audio-video-tools,okorach_sonar-tools --csvSeparator '+'
122+
f="findings-$env-unrel.csv"; run_test "$f" sonar-findings-export -v DEBUG -f "$f"
123+
f="findings-$env-1.json"; run_test "$f" sonar-findings-export -f "$f"
124+
f="findings-$env-2.json"; run_test_stdout "$f" sonar-findings-export -v DEBUG --format json -k okorach_audio-video-tools,okorach_sonar-tools
125+
f="findings-$env-3.json"; run_test_stdout "$f" sonar-findings-export -v DEBUG --format json -k okorach_audio-video-tools,okorach_sonar-tools --useFindings
126+
f="findings-$env-4.csv"; run_test_stdout "$f" sonar-findings-export --format csv -k okorach_audio-video-tools,okorach_sonar-tools --csvSeparator '+'
127127

128128
if [ "$env" = "sonarcloud" ]; then
129129
logmsg "IT $env sonar-audit SKIPPED"
130130
logmsg "IT $env sonar-housekeeper SKIPPED"
131131
else
132132
logmsg "IT $env sonar-audit"
133-
f="$TMP/audit-$env-unrel.csv"; run_test_stdout "$f" sonar-audit
134-
f="$TMP/audit-$env-1.json"; run_test "$f" sonar-audit -f "$f"
135-
f="$TMP/audit-$env-2.json"; run_test_stdout "$f" sonar-audit --format json --what qualitygates,qualityprofiles,settings
136-
f="$TMP/audit-$env-3.csv"; run_test_stdout "$f" sonar-audit --csvSeparator '+' --format csv
133+
f="audit-$env-unrel.csv"; run_test_stdout "$f" sonar-audit
134+
f="audit-$env-1.json"; run_test "$f" sonar-audit -f "$f"
135+
f="audit-$env-2.json"; run_test_stdout "$f" sonar-audit --format json --what qualitygates,qualityprofiles,settings
136+
f="audit-$env-3.csv"; run_test_stdout "$f" sonar-audit --csvSeparator '+' --format csv
137137

138138
logmsg "IT $env sonar-housekeeper"
139-
f="$TMP/housekeeper-$env-1.csv"; run_test_stdout "$f" sonar-housekeeper -P 365 -B 90 -T 180 -R 30
139+
f="housekeeper-$env-1.csv"; run_test_stdout "$f" sonar-housekeeper -P 365 -B 90 -T 180 -R 30
140140
fi
141141

142142
logmsg "IT $env sonar-loc"
143-
f="$TMP/loc-$env-1.csv"; run_test_stdout "$f" sonar-loc
144-
f="$TMP/loc-$env-unrel.csv"; run_test_stdout "$f" sonar-loc -n -a
145-
f="$TMP/loc-$env-2.csv"; run_test "$f" sonar-loc -n -a -f "$f" --csvSeparator ';'
143+
f="loc-$env-1.csv"; run_test_stdout "$f" sonar-loc
144+
f="loc-$env-unrel.csv"; run_test_stdout "$f" sonar-loc -n -a
145+
f="loc-$env-2.csv"; run_test "$f" sonar-loc -n -a -f "$f" --csvSeparator ';'
146146

147147
logmsg "sonar-rules $env"
148-
f="$TMP/rules-$env-1.csv"; run_test_stdout "$f" sonar-rules -e
149-
f="$TMP/rules-$env-2.csv"; run_test "$f" sonar-rules -e -f "$f"
150-
f="$TMP/rules-$env-3.json"; run_test_stdout "$f" sonar-rules -e --format json
151-
f="$TMP/rules-$env-4.json"; run_test "$f" sonar-rules -e -f "$f"
148+
f="rules-$env-1.csv"; run_test_stdout "$f" sonar-rules -e
149+
f="rules-$env-2.csv"; run_test "$f" sonar-rules -e -f "$f"
150+
f="rules-$env-3.json"; run_test_stdout "$f" sonar-rules -e --format json
151+
f="rules-$env-4.json"; run_test "$f" sonar-rules -e -f "$f"
152152

153153
logmsg "sonar-config $env"
154-
f="$TMP/config-$env-1.json"; run_test_stdout "$f" sonar-config -e -w "qualitygates, qualityprofiles, projects" -k okorach_audio-video-tools,okorach_sonar-tools
155-
f="$TMP/config-$env-2.json"; run_test_stdout "$f" sonar-config --export
156-
f="$TMP/config-$env-unrel.json"; run_test "$f" sonar-config --export -f "$f"
154+
f="config-$env-1.json"; run_test_stdout "$f" sonar-config -e -w "qualitygates, qualityprofiles, projects" -k okorach_audio-video-tools,okorach_sonar-tools
155+
f="config-$env-2.json"; run_test_stdout "$f" sonar-config --export
156+
f="config-$env-unrel.json"; run_test "$f" sonar-config --export -f "$f"
157157

158158
if [ $noExport -eq 1 ]; then
159159
logmsg "sonar-projects-export $env test skipped"
@@ -165,14 +165,14 @@ do
165165
fi
166166

167167
logmsg "sonar-findings-export $env ADMIN export"
168-
f1="$TMP/findings-$env-admin.csv"; run_test "$f1" sonar-findings-export -v DEBUG -f "$f1" -k okorach_audio-video-tools,okorach_sonar-tools
168+
f1="findings-$env-admin.csv"; run_test "$f1" sonar-findings-export -v DEBUG -f "$f1" -k okorach_audio-video-tools,okorach_sonar-tools
169169

170170
if [ "$env" = "sonarcloud" ]; then
171171
logmsg "sonar-projects-export $env SKIPPED"
172172
else
173173
logmsg "sonar-findings-export $env USER export"
174174
export SONAR_TOKEN=$SONAR_TOKEN_USER_USER
175-
f2="$TMP/findings-$env-user.csv"; run_test "$f2" sonar-findings-export -v DEBUG -f "$f2" -k okorach_audio-video-tools,okorach_sonar-tools
175+
f2="findings-$env-user.csv"; run_test "$f2" sonar-findings-export -v DEBUG -f "$f2" -k okorach_audio-video-tools,okorach_sonar-tools
176176
fi
177177

178178
# Restore admin token as long as previous version is 2.9 or less
@@ -181,26 +181,26 @@ do
181181

182182
export SONAR_TOKEN="$SONAR_TOKEN_ADMIN_USER"
183183
logmsg "IT released tools $env"
184-
run_test sonar-measures-export -b -f "$TMP/measures-$env-rel.csv" -m _main --withURL
185-
run_test sonar-findings-export -f "$TMP/findings-$env-rel.csv"
186-
run_test sonar-audit -f "$TMP/audit-$env-rel.csv"
187-
run_test sonar-loc -n -a -f "$TMP/loc-$env-rel.csv"
188-
run_test sonar-config -e -f "$TMP/config-$env-rel.json"
184+
run_test sonar-measures-export -b -f "measures-$env-rel.csv" -m _main --withURL
185+
run_test sonar-findings-export -f "findings-$env-rel.csv"
186+
run_test sonar-audit -f "audit-$env-rel.csv"
187+
run_test sonar-loc -n -a -f "loc-$env-rel.csv"
188+
run_test sonar-config -e -f "config-$env-rel.json"
189189

190190
logmsg "IT compare released and unreleased $env"
191191
for f in measures findings audit loc
192192
do
193-
root="$TMP/$f-$env"
193+
root="$f-$env"
194194
announce_test "$f-$env diff"
195195
sort -o "$root-rel.csv" "$root-rel.csv"
196196
sort -o "$root-unrel.csv" "$root-unrel.csv"
197-
test_passed_if_identical "$root-rel.csv" "$root-unrel.csv"
197+
test_passed_if_identical "$TMP/$root-rel.csv" "$TMP/$root-unrel.csv"
198198
done
199199
for f in config
200200
do
201-
root="$TMP/$f-$env"
201+
root="$f-$env"
202202
announce_test "$f-$env diff"
203-
test_passed_if_identical "$root-rel.json" "$root-unrel.json"
203+
test_passed_if_identical "$TMP/$root-rel.json" "$TMP/$root-unrel.json"
204204
done
205205
announce_test "findings-$env admin vs user diff"
206206
test_passed_if_identical "$TMP/findings-$env-admin.csv" "$TMP/findings-$env-user.csv"

‎test/test-tools.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ function run_test_stdout {
5555
# logmsg "$@ >$file"
5656
# logmsg "========================================="
5757
if [ "$SONAR_HOST_URL" == "$SONAR_HOST_URL_SONARCLOUD" ]; then
58-
"$@" -o okorach -l $IT_LOG_FILE >"$file" 2>/dev/null
58+
"$@" -o okorach -l $IT_LOG_FILE >"$REPO_ROOT/tmp/$file" 2>/dev/null
5959
else
60-
"$@" -l $IT_LOG_FILE >"$file" 2>/dev/null
60+
"$@" -l $IT_LOG_FILE >"$REPO_ROOT/tmp/$file" 2>/dev/null
6161
fi
62-
test_passed_if_file_not_empty "$file"
62+
test_passed_if_file_not_empty "$REPO_ROOT/tmp/$file"
6363
}
6464

6565
check_file_not_empty() {

0 commit comments

Comments
 (0)