Commit fe344582 authored by Giovanni La Mura's avatar Giovanni La Mura
Browse files

Prepare pipeline to execute separate tests for output

parent 90ee07a0

.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -193,9 +193,9 @@ sanity_stage: 
      - valgrind --leak-check=full --log-file=valgrind.log ./test_ParticleDescriptor

      - grep "0 errors from 0 contexts" valgrind.log

      - echo "Running memory sanity check for output classes"

      - chmod +x test_outputs

      - chmod +x test_cluster_outputs

      - rm valgrind.log

      - valgrind --leak-check=full --log-file=valgrind.log ./test_outputs

      - valgrind --leak-check=full --log-file=valgrind.log ./test_cluster_outputs

      - grep "0 errors from 0 contexts" valgrind.log

      - rm -rf c_OCLU_24
@@ -295,8 +295,8 @@ testing_stage: 
      - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OCLU --html=pycompare_48.html

      - cd ../testing

      - echo "Checking consistency of HDF5 output"

      - chmod u+x test_outputs

      - ./test_outputs

      - chmod u+x test_cluster_outputs

      - ./test_cluster_outputs

      - export FFILE=../../test_data/cluster/OCLU_24

      - python3 ../../src/scripts/pycompare.py --no-progress --ffile $FFILE --cfile c_OCLU_24

      - rm -rf c_OCLU_24

build/Makefile

+4 −4
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ NP_SPHERE_BINS=sphere/np_sphere 
NP_TRAPPING_SRCS=../src/trapping/np_trapping.cpp ../src/trapping/cfrfme.cpp ../src/trapping/clffft.cpp

NP_TRAPPING_OBJS=../src/trapping/np_trapping.o ../src/trapping/cfrfme.o ../src/trapping/clffft.o

NP_TRAPPING_BINS=trapping/np_trapping

NP_TESTING_OBJS=../src/testing/test_outputs.o ../src/testing/test_ParticleDescriptor.o ../src/testing/test_TEDF.o ../src/testing/test_TTMS.o

NP_TESTING_BINS=testing/test_outputs testing/test_ParticleDescriptor testing/test_TEDF testing/test_TTMS

NP_TESTING_OBJS=../src/testing/test_cluster_outputs.o ../src/testing/test_ParticleDescriptor.o ../src/testing/test_TEDF.o ../src/testing/test_TTMS.o

NP_TESTING_BINS=testing/test_cluster_outputs testing/test_ParticleDescriptor testing/test_TEDF testing/test_TTMS



all: $(NPTM_LIB) $(FORTRAN_BINS) $(NP_CLUSTER_BINS) $(NP_INCLUSION_BINS) $(NP_SPHERE_BINS) $(NP_TRAPPING_BINS) $(NP_TESTING_BINS)
@@ -83,8 +83,8 @@ trapping/np_trapping: $(NPTM_LIB) $(NP_TRAPPING_OBJS) 
testing/test_ParticleDescriptor: $(NPTM_LIB) ../src/testing/test_ParticleDescriptor.o

	$(CXX) $(CXXFLAGS) ../src/testing/test_ParticleDescriptor.o -o $@ $(CXXLDFLAGS)



testing/test_outputs: $(NPTM_LIB) ../src/testing/test_outputs.o

	$(CXX) $(CXXFLAGS) ../src/testing/test_outputs.o -o $@ $(CXXLDFLAGS)

testing/test_cluster_outputs: $(NPTM_LIB) ../src/testing/test_cluster_outputs.o

	$(CXX) $(CXXFLAGS) ../src/testing/test_cluster_outputs.o -o $@ $(CXXLDFLAGS)



testing/test_TEDF: $(NPTM_LIB) ../src/testing/test_TEDF.o

	$(CXX) $(CXXFLAGS) ../src/testing/test_TEDF.o -o $@ $(CXXLDFLAGS)