Skip to content

Commit 3c323d0

Browse files
committed
Why...
1 parent 24e0440 commit 3c323d0

File tree

1 file changed

+31
-31
lines changed

1 file changed

+31
-31
lines changed

.github/jobs/configure-checks/all.bats

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -45,22 +45,22 @@ setup_user() {
4545
chown -R $u:$u ./
4646
}
4747

48-
#translate () {
49-
# args="$@"
50-
# if [ "$distro_id" = "ID=arch" ]; then
51-
# args=${args/g++/}
52-
# args=${args/libcgroup-dev/}
53-
# fi
54-
# if [ "$distro_id" = 'ID="opensuse-leap"' ]; then
55-
# args=${args/g++/gcc-c++}
56-
# args=${args/libcgroup-dev/libcgroup-devel}
57-
# fi
58-
# if [ "$distro_id" = "ID=fedora" ]; then
59-
# args=${args/libcgroup-dev/libcgroup-devel}
60-
# fi
61-
# echo "$args"
62-
#}
63-
#
48+
translate () {
49+
args="$@"
50+
if [ "$distro_id" = "ID=arch" ]; then
51+
args=${args/g++/}
52+
args=${args/libcgroup-dev/}
53+
fi
54+
if [ "$distro_id" = 'ID="opensuse-leap"' ]; then
55+
args=${args/g++/gcc-c++}
56+
args=${args/libcgroup-dev/libcgroup-devel}
57+
fi
58+
if [ "$distro_id" = "ID=fedora" ]; then
59+
args=${args/libcgroup-dev/libcgroup-devel}
60+
fi
61+
echo "$args"
62+
}
63+
6464
#repo-install () {
6565
# args=$(translate $@)
6666
# if [ "$distro_id" = "ID=alpine" ]; then
@@ -93,20 +93,20 @@ setup_user() {
9393
# fi
9494
#}
9595
#
96-
#setup() {
97-
# setup_user
98-
# for shared_file in config.log confdefs.h conftest.err; do
99-
# chmod a+rw $shared_file || true
100-
# done
101-
# if [ "$distro_id" = "ID=fedora" ]; then
102-
# repo-install httpd
103-
# fi
104-
# if [ "$distro_id" = 'ID="opensuse-leap"' ]; then
105-
# repo-install apache2
106-
# fi
107-
# repo-install gcc g++ libcgroup-dev composer
108-
#}
109-
#
96+
setup() {
97+
setup_user
98+
for shared_file in config.log confdefs.h conftest.err; do
99+
chmod a+rw $shared_file || true
100+
done
101+
if [ "$distro_id" = "ID=fedora" ]; then
102+
repo-install httpd
103+
fi
104+
if [ "$distro_id" = 'ID="opensuse-leap"' ]; then
105+
repo-install apache2
106+
fi
107+
repo-install gcc g++ libcgroup-dev composer
108+
}
109+
110110
run_configure () {
111111
su $u -c "./configure $*"
112112
}
@@ -153,7 +153,7 @@ compile_assertions_finished () {
153153
# In the default image none of these tools were installed for:
154154
# arch, alpine, opensuse, fedora, debian & ubuntu
155155
run pacman -Q
156-
assert_line "nothing: gcc 14.2.1+r753+g1cd744a6828f-1"
156+
refute_line "gcc 14.2.1+r753+g1cd744a6828f-1"
157157
#repo-remove gcc g++ clang
158158
#run pacman -Q
159159
#refute_line "gcc 14.2.1+r753+g1cd744a6828f-1"

0 commit comments

Comments
 (0)