Skip to content

Commit

Permalink
Fix windows build files.
Browse files Browse the repository at this point in the history
  • Loading branch information
johnoel committed Dec 24, 2014
1 parent 9a6dd3e commit 973f78a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 45 deletions.
4 changes: 2 additions & 2 deletions tests/agemat/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ agemat.dat:
svn cat svn://scm.r-forge.r-project.org/svnroot/nwfscassmt/pkg/nwfscAgeingError/inst/doc/agemat.dat > agemat.dat

total-clean:
@del /Q agemat.dat
@del /Q agemat.tpl
@if exist agemat.dat del /Q agemat.dat
@if exist agemat.tpl del /Q agemat.tpl

clean:
@del /Q agemat agemat.cpp agemat.htp agemat.obj
Expand Down
8 changes: 4 additions & 4 deletions tests/glmmadmb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ run:
glmmadmb.exe

total-clean: clean
@rmdir /s /q admb_tests
@del bvprobit.tpl
@del glmmadmb.tpl
@del nbmm.tpl
@if exist admb_tests rmdir /s /q admb_tests
@if exist bvprobit.tpl del bvprobit.tpl
@if exist glmmadmb.tpl del glmmadmb.tpl
@if exist nbmm.tpl del nbmm.tpl

clean:
@del admodel.cov
Expand Down
41 changes: 2 additions & 39 deletions tests/gtests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,42 +11,7 @@ ADMB_OPTIONS=-g
GTEST_DIR=googletest-read-only

GTESTS=\
test_adstring_strcase.cpp\
test_fmm_control.cpp\
test_adstring.cpp\
test_adstring_array.cpp\
test_dlist.cpp\
test_ad_comm.cpp\
test_gradient_structure.cpp\
test_option_match.cpp\
test_lvector.cpp\
test_df3_two_variable.cpp\
test_adjson.cpp\
test_adpool.cpp\
test_dvector.cpp\
test_dmatrix.cpp\
test_param_init_bounded_number_vector.cpp\
test_param_init_d3array.cpp\
test_spline.cpp\
test_banded_symmetric_dmatrix.cpp\
test_line_adstring.cpp\
test_ivector.cpp\
test_multi_index.cpp\
test_adtimer.cpp\
test_idea.cpp\
test_df_file.cpp\
test_multinomial.cpp\
test_multi_index.cpp\
test_cifstream.cpp\
test_param_init_vector_vector.cpp\
test_param_init_matrix_vector.cpp\
test_param_init_bounded_vector_vector.cpp\
test_param_init_number_vector.cpp\
test_pow.cpp\
test_dvariable.cpp\
test_imatrix.cpp\
test_lmatrix.cpp\
test_dvar_matrix.cpp\
main.cpp

##Need to debug this
Expand All @@ -57,12 +22,10 @@ GTESTS=\
# df1b2atan2.obj\
# scalefactor.obj\
all: clean gtest-all test_scalefactor test_finance
all: clean gtest-all
ifeq ($(SHELL),cmd)
gtest-all
else
./test_scalefactor
./test_finance
./gtest-all
endif

Expand Down Expand Up @@ -155,7 +118,7 @@ df33_tester:

total-clean: clean
ifeq ($(SHELL),cmd)
@rmdir /s /q googletest-read-only
@if exist googletest-read-only rmdir /s /q googletest-read-only
else
@rm -rvf googletest-read-only
endif
Expand Down

0 comments on commit 973f78a

Please sign in to comment.