Skip to content

Commit

Permalink
move e2e.bash into tests/e2e subdirectory
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthewMerrill committed Jun 7, 2019
1 parent ba23637 commit e1b6376
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -17,7 +17,7 @@ macros:
- wget http://dl-cdn.alpinelinux.org/alpine/v3.9/releases/x86/alpine-minirootfs-3.9.4-x86.tar.gz -O alpine.tar.gz
- ./tools/fakefsify.py alpine.tar.gz alpine
- grep nameserver /etc/resolv.conf | head -1 | ./build/ish -f ./alpine /bin/sed -n "w /etc/resolv.conf"
- bash e2e.bash
- bash tests/e2e/e2e.bash

matrix:
include:
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Expand Up @@ -161,5 +161,5 @@ if not meson.is_cross_build()
test('float80', float80_test, should_fail: true)
endif

e2e_test = find_program('e2e.bash')
e2e_test = find_program('tests/e2e/e2e.bash')
test('e2e', e2e_test, timeout: 120)
1 change: 1 addition & 0 deletions e2e.bash → tests/e2e/e2e.bash
@@ -1,5 +1,6 @@
#!/bin/bash
cd "$(dirname "$0")"
cd ../../
mkdir -p e2e_out

FS=./alpine
Expand Down

0 comments on commit e1b6376

Please sign in to comment.