Skip to content

Commit 97bf9d6

Browse files
committed
[tests] fix paths
1 parent 510666b commit 97bf9d6

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

TESTS_ENVIRONMENT.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,11 +126,11 @@ run_cap_test() {
126126
-e "s;${LNAV_VERSION};{LNAV_VERSION};g" \
127127
-e "s;${test_dir};{test_dir};g" \
128128
-e "s;${builddir};{test_dir};g" \
129-
-e "s;${top_builddir_abs};{buildir};g" \
130129
-e "s;${ROOT_DIR};{root_dir};g" \
131130
-e "s;${top_srcdir};{top_srcdir};g" \
132131
-e "s;${top_srcdir_parent};{top_srcdir_parent};g" \
133132
-e "s;${TMPDIR};{TMPDIR};g" \
133+
-e "s;${top_builddir_abs};{buildir};g" \
134134
-e "s;/tmp/;{TMPDIR};g" \
135135
-e "s;lnav-user-${UID}-work;lnav-user-{uid}-work;g" \
136136
${test_file_base}_${test_hash}.out
@@ -159,13 +159,14 @@ run_cap_test() {
159159
sed -ibak -E \
160160
-e "s;${prefix}/etc;{prefix}/etc;g" \
161161
-e "s;${LNAV_VERSION};{LNAV_VERSION};g" \
162+
-e "s;${top_builddir_abs}/src/lnav-test;{lnav-test};g" \
162163
-e "s;${test_dir};{test_dir};g" \
163164
-e "s;${ROOT_DIR};{root_dir};g" \
164165
-e "s;${builddir};{builddir};g" \
165-
-e "s;${top_builddir_abs};{buildir};g" \
166166
-e "s;${top_srcdir};{top_srcdir};g" \
167167
-e "s;${TMPDIR};{TMPDIR};g" \
168168
-e "s;/tmp/;{TMPDIR};g" \
169+
-e "s;${top_builddir_abs};{buildir};g" \
169170
-e "s;lnav-user-${UID}-work;lnav-user-{uid}-work;g" \
170171
-e 's;"errorId":".+";;g' \
171172
${test_file_base}_${test_hash}.err

test/expected/test_cli.sh_64555477e8795379ae33a3dbca8113cf7111ff2b.err

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ make it easier to navigate through files quickly.
5252

5353
Paths
5454
• This binary:
55-
🧭 {buildir}/src/lnav-test
55+
🧭 {lnav-test}
5656
• Format files are read from:
5757
📂 /etc/lnav
5858
📂 {prefix}/etc/lnav

0 commit comments

Comments
 (0)