Skip to content
Permalink
Browse files

travis: fix octave tests

  • Loading branch information...
FreyJo committed Sep 13, 2019
1 parent f3e5b2d commit dab97fb7c3c682fedd5192af3065512a037ef045
@@ -43,6 +43,7 @@ matrix:
- MATRIX_EVAL="CC=gcc-6 && CXX=g++-6"
- ACADOS_OCTAVE="ON"
- ACADOS_EXAMPLES="OFF"
- ACADOS_UNIT_TESTS="OFF"

- name: Linux Gcc4.9 - Octave interface + coverage
env:
@@ -57,7 +57,7 @@ elif [ "${SECTION}" = 'install' ]; then
find $(pwd) -name 'hpipm_common.h';

source "${SCRIPT_DIR}/install_octave.sh";
export OCTAVE_PATH="${ACADOS_SOURCE_DIR}/interfaces/acados_matlab":$OCTAVE_PATH;
export OCTAVE_PATH="${ACADOS_SOURCE_DIR}/interfaces/acados_matlab_octave":$OCTAVE_PATH;
echo "OCTAVE_PATH=$OCTAVE_PATH";
fi

@@ -32,15 +32,20 @@
%

%% check that environment variables are provided
require_env_variable('LD_LIBRARY_PATH');
require_env_variable('ACADOS_INSTALL_DIR');

if is_octave()
require_env_variable('OCTAVE_PATH');
else
require_env_variable('MATLABPATH');
try
require_env_variable('LD_LIBRARY_PATH');
require_env_variable('ACADOS_INSTALL_DIR');
if is_octave()
require_env_variable('OCTAVE_PATH');
else
require_env_variable('MATLABPATH');
end
catch exception
exit_with_error(exception);
end



%% ocp tests
try
test_ocp_pendulum_on_cart;
@@ -32,16 +32,22 @@
%

%% check that environment variables are provided
require_env_variable('LD_LIBRARY_PATH');
require_env_variable('ACADOS_INSTALL_DIR');

if is_octave()
require_env_variable('OCTAVE_PATH');
else
require_env_variable('MATLABPATH');

try
require_env_variable('LD_LIBRARY_PATH');
require_env_variable('ACADOS_INSTALL_DIR');
if is_octave()
require_env_variable('OCTAVE_PATH');
else
require_env_variable('MATLABPATH');
end
catch exception
exit_with_error(exception);
end

% test that checks work

%% test that checks work
try
test_checks;
catch exception
@@ -53,7 +59,7 @@
end


% sim tests
%% sim tests
try
test_sens_forw;
test_sens_adj;
@@ -74,6 +74,8 @@ function ocp_compile_mex(opts)
fclose(input_file);
cflags_tmp = [cflags_tmp, ' -std=c99 -fopenmp'];
if (strcmp(opts.qp_solver, 'full_condensing_qpoases'))
disp('compiling mex with qpOASES')
disp('compiling mex with qpOASES')
cflags_tmp = [cflags_tmp, ' -DACADOS_WITH_QPOASES'];
end
input_file = fopen(fullfile(opts.output_dir, 'cflags_octave.txt'), 'w');

0 comments on commit dab97fb

Please sign in to comment.
You can’t perform that action at this time.