diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb757e74ca23700f14c2c6c55e91d13bc3bf795d..874b467d8d0b3afdcd8b265d9e7794958a4e5f11 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,8 +38,8 @@ building_stage: - echo $CI_COMMIT_SHA - echo $CI_COMMIT_BRANCH - cd src - - echo "Running make" - - make + - echo "Running make (ONLY C++ CODE)" + - make conly running_stage: stage: run @@ -62,18 +62,12 @@ running_stage: - echo $CI_COMMIT_SHA - echo $CI_COMMIT_BRANCH - cd build/sphere - - echo "Running SPH" - - chmod +x edfb sph np_sphere - - ./edfb - - ./sph - echo "Running np_sphere" + - chmod +x np_sphere - ./np_sphere - cd ../cluster - - echo "Running CLU" - - chmod +x edfb clu np_cluster - - ./edfb - - ./clu - echo "Running np_cluster" + - chmod +x np_cluster - ./np_cluster testing_stage: @@ -96,9 +90,11 @@ testing_stage: - echo $CI_COMMIT_SHA - echo $CI_COMMIT_BRANCH - cd build/sphere + - cp ../../test_data/sphere/OSPH . - echo "Comparing output of SPHERE" - python3 ../../src/scripts/pycompare.py --ffile=OSPH --cfile=c_OSPH --html - cd ../cluster - echo "Comparing output of CLUSTER" + - cp ../../test_data/cluster/OCLU . - python3 ../../src/scripts/pycompare.py --ffile=OCLU --cfile=c_OCLU --html