Skip to content

Commit 99fb11e

Browse files
authored
Merge pull request #434 from k-okada/move-test-defforegn
mv contrib/eus64-check to euslisp/test
2 parents 0eae6d3 + 9bd27b8 commit 99fb11e

File tree

13 files changed

+1424
-558
lines changed

13 files changed

+1424
-558
lines changed

.travis.sh

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,27 @@ if [ "$QEMU" != "" ]; then
8787
export EXIT_STATUS=0;
8888
set +e
8989
# run test in EusLisp/test
90+
make -C test
9091
for test_l in test/*.l; do
9192

93+
[[ "`uname -m`" == "ppc64le"* && $test_l =~ test-foreign.l ]] && continue;
94+
9295
travis_time_start euslisp.${test_l##*/}.test
9396

9497
sed -i 's/\(i-max\ [0-9]000\)0*/\1/' $test_l
9598

9699
eusgl $test_l;
97100
export TMP_EXIT_STATUS=$?
98101

99-
travis_time_end `expr 32 - $TMP_EXIT_STATUS`
102+
export CONTINUE=0
103+
# test-foreign.l only works for x86 / arm
104+
if [[ $test_l =~ test-foreign.l && ! "$(gcc -dumpmachine)" =~ "aarch".*|"arm".*|"x86_64".*|"i"[0-9]"86".* ]]; then export CONTINUE=1; fi
105+
106+
if [[ $CONTINUE == 0 ]]; then travis_time_end `expr 32 - $TMP_EXIT_STATUS`; else travis_time_end 33; fi
107+
108+
if [[ $TMP_EXIT_STATUS != 0 ]]; then echo "Failed running $test_l. Exiting with $TMP_EXIT_STATUS"; fi
109+
110+
if [[ $CONTINUE != 0 ]]; then export TMP_EXIT_STATUS=0; fi
100111

101112
export EXIT_STATUS=`expr $TMP_EXIT_STATUS + $EXIT_STATUS`;
102113

@@ -105,7 +116,6 @@ if [ "$QEMU" != "" ]; then
105116
eusgl "(let ((o (namestring (merge-pathnames \".o\" \"$test_l\"))) (so (namestring (merge-pathnames \".so\" \"$test_l\")))) (compile-file \"$test_l\" :o o) (if (probe-file so) (load so) (exit 1))))"
106117
export TMP_EXIT_STATUS=$?
107118

108-
export CONTINUE=0
109119
# const.l does not compilable https://github.com/euslisp/EusLisp/issues/318
110120
if [[ $test_l =~ const.l ]]; then export CONTINUE=1; fi
111121

@@ -235,6 +245,7 @@ if [[ "`uname -m`" == "aarch"* ]]; then
235245
fi
236246

237247
# run test in EusLisp/test
248+
make -C $CI_SOURCE_PATH/test
238249
for test_l in $CI_SOURCE_PATH/test/*.l; do
239250

240251
travis_time_start euslisp.${test_l##*/}.test
@@ -299,15 +310,6 @@ fi
299310

300311
[ $EXIT_STATUS == 0 ] || exit 1
301312

302-
travis_time_start eus64.test
303-
304-
if [[ "$TRAVIS_OS_NAME" == "osx" || "`uname -m`" == "arm"* ]]; then
305-
uname -a
306-
else
307-
make -C eus/contrib/eus64-check/ || exit 1 # check eus64-check
308-
fi
309-
travis_time_end
310-
311313
if [ "$TRAVIS_OS_NAME" == "linux" -a "`uname -m`" == "x86_64" ]; then
312314

313315
travis_time_start script.doc

contrib/eus64-check/Makefile

Lines changed: 0 additions & 34 deletions
This file was deleted.

contrib/eus64-check/eus64-module.l

Lines changed: 0 additions & 38 deletions
This file was deleted.

contrib/eus64-check/eus64-test.l

Lines changed: 0 additions & 249 deletions
This file was deleted.

0 commit comments

Comments
 (0)