Skip to content

Commit 3369fb3

Browse files
committed
no bins
1 parent 04a8852 commit 3369fb3

2 files changed

Lines changed: 10 additions & 18 deletions

File tree

.travis.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,12 @@ language: c
22
sudo: false
33

44
before_script:
5-
- pushd test/
5+
- cd test/
66
- make
7-
- popd
8-
- mkdir bin/
97

108
script:
11-
- pushd bin/
129
- ./ulapack_test_static
1310
- ./ulapack_test_dynamic
14-
- popd
1511

1612
after_script:
17-
- pushd test/
1813
- make clean
19-
- popd

test/Makefile

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
cc=cc
22
cc_options=-std=c99 -Wall -Wextra -Werror -Os
33

4-
bin_dir=../bin
5-
64
static_test_exec=ulapack_test_static
75
static_test_options=-DULAPACK_USE_STATIC_ALLOC=1 -DULAPACK_MAX_MATRIX_N_COLS=40 -DULAPACK_MAX_MATRIX_N_ROWS=40
86

@@ -11,17 +9,17 @@ dynamic_test_options=-DULAPACK_USE_DYNAMIC_ALLOC=1
119

1210
src=../src
1311

14-
all : $(bin_dir)/$(static_test_exec) $(bin_dir)/$(dynamic_test_exec)
12+
all : $(static_test_exec) $(dynamic_test_exec)
1513

16-
test : $(bin_dir)/$(static_test_exec) $(bin_dir)/$(dynamic_test_exec)
17-
$(bin_dir)/$(static_test_exec)
18-
$(bin_dir)/$(dynamic_test_exec)
14+
test : $(static_test_exec) $(dynamic_test_exec)
15+
./$(static_test_exec)
16+
./$(dynamic_test_exec)
1917

20-
$(bin_dir)/$(static_test_exec) : static_unit_tests.o ulapack_static.o
21-
$(cc) $(cc_options) unit_tests.o ulapack.o -lm -o $(bin_dir)/$(static_test_exec)
18+
$(static_test_exec) : static_unit_tests.o ulapack_static.o
19+
$(cc) $(cc_options) unit_tests.o ulapack.o -lm -o $(static_test_exec)
2220

23-
$(bin_dir)/$(dynamic_test_exec) : dynamic_unit_tests.o ulapack_dynamic.o
24-
$(cc) $(cc_options) unit_tests.o ulapack.o -lm -o $(bin_dir)/$(dynamic_test_exec)
21+
$(dynamic_test_exec) : dynamic_unit_tests.o ulapack_dynamic.o
22+
$(cc) $(cc_options) unit_tests.o ulapack.o -lm -o $(dynamic_test_exec)
2523

2624
dynamic_unit_tests.o : unit_tests.c ulapack_dynamic.o
2725
$(cc) $(cc_options) -I$(src) -c unit_tests.c $(dynamic_test_options)
@@ -38,4 +36,4 @@ ulapack_dynamic.o : $(src)/ulapack.c ulapack_headers
3836
ulapack_headers : $(src)/ulapack.h $(src)/ulapack_options.h $(src)/ulapack_type.h
3937

4038
clean :
41-
rm *.o $(bin_dir)/$(static_test_exec) $(bin_dir)/$(dynamic_test_exec)
39+
rm *.o $(dynamic_test_exec) $(static_test_exec)

0 commit comments

Comments
 (0)