Skip to content

Commit

Permalink
[test/spec-bin] Upgrade busybox to version 1.35.0
Browse files Browse the repository at this point in the history
- spec/ble-idioms: busybox ash changed evaluation order behavior, but it
  didn't fix to match other shells!
- spec/builtin-io: busybox ash fixed a bug with read -d

Addresses #1074.
  • Loading branch information
Andy C committed Jan 20, 2022
1 parent 554cbc1 commit 57ad2d7
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 25 deletions.
15 changes: 12 additions & 3 deletions spec/ble-idioms.test.sh
Expand Up @@ -41,11 +41,20 @@ shopt -s eval_unsafe_arith
y=a=123 n=a=321
echo $((1?(y):(n))):$((a))
echo $((0?(y):(n))):$((a))
## stdout-json: "123:123\n321:321\n"
## BUG ash stdout-json: "123:123\n321:123\n"
## STDOUT:
123:123
321:321
## END
## BUG ash STDOUT:
123:321
321:321
## END
## N-I dash status: 2
## N-I dash stdout-json: ""
## N-I yash stdout-json: "a=123:0\na=321:0\n"
## N-I yash STDOUT:
a=123:0
a=321:0
## END

#### recursive arith: side effects
# In Zsh and Busybox sh, the side effect of inner arithmetic
Expand Down
10 changes: 0 additions & 10 deletions spec/builtin-io.test.sh
Expand Up @@ -490,11 +490,6 @@ v1=
v1= v2=
v1= v2= v3=
## END
## BUG ash STDOUT:
v1=a,b,c
v1=d,e,f v2=
v1=g,h,i v2= v3=
## END

#### read -d '' (null-separated records)
printf 'a,b,c\0d,e,f\0g,h,i' | {
Expand All @@ -516,11 +511,6 @@ v1=
v1= v2=
v1= v2= v3=
## END
## BUG ash STDOUT:
v1=a,b,cd,e,fg,h,i
v1= v2=
v1= v2= v3=
## END

#### read -rd
read -rd '' var <<EOF
Expand Down
14 changes: 3 additions & 11 deletions test/spec-bin.sh
Expand Up @@ -211,28 +211,20 @@ download-original-source() {
_wget https://downloads.sourceforge.net/project/zsh/zsh/5.3.1/zsh-5.3.1.tar.xz

_wget https://osdn.net/dl/yash/yash-2.49.tar.xz

_wget https://www.busybox.net/downloads/busybox-1.35.0.tar.bz2
}

publish-mirror() {
### Mirror the source tarballs at oilshell.org/blob/spec-bin
local user=$1
local host=$user.org

local file=$2

local dest=$user@$host:oilshell.org/blob/spec-bin
local dest=$user@oilshell.org:oilshell.org/blob/spec-bin

scp $file $dest
}

publish-tmp() {
local name=$1 # required

local dest=oilshell.org/share/2018-10-06-tmp/
ssh ${name}@${name}.org mkdir -p $dest
scp _deps/re2c-1.0.3/re2c ${name}@${name}.org:$dest
}

all-steps() {
# Uncomment to rebuild the Travis cache in _deps/
#if false; then
Expand Down
2 changes: 1 addition & 1 deletion test/spec-common.sh
Expand Up @@ -4,7 +4,7 @@

SPEC_JOB=${SPEC_JOB:-survey}

readonly BUSYBOX_NAME='busybox-1.31.1'
readonly BUSYBOX_NAME='busybox-1.35.0'
readonly DASH_NAME='dash-0.5.10.2'
readonly YASH_NAME='yash-2.49'

Expand Down

0 comments on commit 57ad2d7

Please sign in to comment.