Skip to content

Commit e1dedfb

Browse files
committed
TST: appveyor: test both static and dynamic linking + upload artifacts also on failure
1 parent bb87897 commit e1dedfb

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

appveyor.yml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,17 @@ build_script:
4747
- set SCRIPT_DIR=%START_DIR%appveyor\
4848
# Need --login to process MSYSTEM variable
4949
- bash --login %SCRIPT_DIR%build_openblas.sh
50-
- bash --login %SCRIPT_DIR%build_gfortran.sh
5150

5251
test_script:
53-
- bash --login -c "$(cygpath $START_DIR)test.exe"
52+
- bash --login %SCRIPT_DIR%build_gfortran.sh
5453
- copy test.exe builds
54+
- copy test_dyn.exe builds
55+
- bash --login -c "$(cygpath $START_DIR)test.exe"
56+
- copy %OPENBLAS_ROOT%\%BUILD_BITS%\bin\*.dll .
57+
- bash --login -c "$(cygpath $START_DIR)test_dyn.exe"
5558

56-
artifacts:
57-
- path: builds\*.*
59+
on_finish:
60+
- ps: Get-ChildItem builds\*.* | % { Push-AppveyorArtifact $_.FullName -FileName $_.Name }
5861

5962
on_success:
6063
# Upload the generated package to Rackspace

appveyor/build_gfortran.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
cd $(cygpath "$START_DIR")
33
OBP=$(cygpath $OPENBLAS_ROOT\\$BUILD_BITS)
44

5+
static_libname=`find $OBP/lib -maxdepth 1 -type f -name '*.a' \! -name '*.dll.a'`
6+
dynamic_libname=`find $OBP/lib -maxdepth 1 -type f -name '*.dll.a'`
7+
58
if [ "$INTERFACE64" == "1" ]; then
6-
gfortran -I $OBP/include -fdefault-integer-8 -o test.exe test64_.f90 \
7-
`ls $OBP/lib/libopenblas64__*.a|grep -Ev '\.(dll|dev)\.a'`
9+
gfortran -I $OBP/include -fdefault-integer-8 -o test.exe test64_.f90 $static_libname
10+
gfortran -I $OBP/include -fdefault-integer-8 -o test_dyn.exe test64_.f90 $dynamic_libname
811
else
9-
gfortran -I $OBP/include -o test.exe test.f90 \
10-
$OBP/lib/libopenblas_*.a
12+
gfortran -I $OBP/include -o test.exe test.f90 $static_libname
13+
gfortran -I $OBP/include -o test_dyn.exe test.f90 $dynamic_libname
1114
fi
12-
13-
./test

0 commit comments

Comments
 (0)