Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
apk-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
apk-tools
Commits
a278d112
Commit
a278d112
authored
3 years ago
by
Alex Xu (Hello71)
Committed by
Timo Teräs
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
test: improve posix sh compatibility
parent
984cd3e0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#92286
passed
3 years ago
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
test/Makefile
+2
-2
2 additions, 2 deletions
test/Makefile
test/solver.sh
+2
-2
2 additions, 2 deletions
test/solver.sh
test/version.sh
+1
-1
1 addition, 1 deletion
test/version.sh
with
5 additions
and
5 deletions
test/Makefile
+
2
−
2
View file @
a278d112
...
...
@@ -50,9 +50,9 @@ repos.stamp: $(repos)
fi
;
\
if
!
APK
=
"
$(
APK
)
"
ROOT
=
"
$(
testroot
)
"
SYSREPO
=
"
$(
SYSREPO
)
"
sh
-ex
./
$<
>
$(
basename
$@
)
.out 2>&1
;
then
\
echo
" FAIL"
;
\
printf
"------------- output -------------
\n
"
>
&2
;
\
printf
'%s\n'
"------------- output -------------"
>
&2
;
\
cat
$(
basename
$@
)
.out
>
&2
;
\
printf
"----------------------------------
\n
"
>
&2
;
\
printf
'%s\n'
"----------------------------------"
>
&2
;
\
exit
1
;
\
fi
;
\
echo
" OK"
;
\
...
...
This diff is collapsed.
Click to expand it.
test/solver.sh
+
2
−
2
View file @
a278d112
...
...
@@ -10,9 +10,9 @@ TEST_TO_RUN="$@"
fail
=
0
pass
=
0
for
test
in
${
TEST_TO_RUN
:-
*.test
}
;
do
get_block ARGS <
$test
| xargs
$APK_TEST
&
> .
$test
.got
get_block ARGS <
$test
| xargs
$APK_TEST
>
.
$test
.got
2>&1
if
!
get_block EXPECT <
$test
| cmp .
$test
.got
&
> /dev/null
;
then
if
!
get_block EXPECT <
$test
| cmp .
$test
.got
>
/dev/null
2>&1
;
then
fail
=
$((
fail+1
))
echo
"FAIL:
$test
"
get_block EXPECT <
$test
| diff
-ru
- .
$test
.got
...
...
This diff is collapsed.
Click to expand it.
test/version.sh
+
1
−
1
View file @
a278d112
...
...
@@ -9,7 +9,7 @@ cat version.data | while read a result b rest ; do
fi
done
if
[
"
$fail
"
=
=
"0"
]
;
then
if
[
"
$fail
"
=
"0"
]
;
then
echo
"OK: version checking works"
fi
...
...
This diff is collapsed.
Click to expand it.
Timo Teräs
@fabled
mentioned in merge request
!66 (closed)
·
3 years ago
mentioned in merge request
!66 (closed)
mentioned in merge request !66
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment