Merge pull request #113 from NNPDF/tests

Enable tests in build

.ciscripts/build-deploy-osx.sh

@@ -2,7 +2,9 @@
 set -u
 set -v
 
-#Find conda
+#Set up netrc file for uploading/downloading
+echo "$NETRC_FILE" | base64 --decode > ~/.netrc
+
 conda build -q conda-recipe
 if [ $? != 0 ]; then
 	echo failed to build

.ciscripts/build-deploy.sh

@@ -2,6 +2,10 @@
 
 #Find conda
 source ~/.bashrc
+#Set up netrc file for uploading/downloading
+echo "$NETRC_FILE" | base64 --decode > ~/.netrc
+
+#Build package
 conda build -q conda-recipe
 if [ $? != 0 ]; then
 	echo failed to build

CMakeLists.txt

@@ -1,5 +1,9 @@
 cmake_minimum_required (VERSION 3.0.2)
 
+#This helps executables on Mac (where the linker didn't graduate from
+#the kindergarden) to find the libraries
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
 # Set a default build type if none was specified
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   message(STATUS "Setting build type to 'Release' as none was specified.")

conda-recipe/build.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+export LDFLAGS=$(echo $LDFLAGS | sed 's/-Wl,-dead_strip_dylibs//g')
+
 mkdir build
 cd build
 cmake .. -DCMAKE_INSTALL_PREFIX=${PREFIX} -DVP_DEV=OFF

conda-recipe/meta.yaml

@@ -39,6 +39,21 @@ requirements:
         - requests
         - prompt_toolkit
 
+test:
+    requires:
+        - hypothesis
+        - pytest
+        - coverage
+        #Build dependencies for catch tests
+        - {{ compiler("cxx") }}
+        - {{ compiler("c") }}
+        - swig ==3.0.10
+        - cmake
+        - pkg-config
+
+    source_files:
+        - "*"
+
 build:
     number: 0
     detect_binary_files_with_prefix: True

conda-recipe/run_test.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+set -u
+set -v
+set -e
+
+#Python tests for the installed validphys package
+pytest --pyargs validphys
+
+
+export LDFLAGS=$(echo $LDFLAGS | sed 's/-Wl,-dead_strip_dylibs//g')
+
+mkdir bldtest
+cd bldtest
+cmake .. -DENABLE_TESTS=ON
+make catch_test -j
+./libnnpdf/tests/catch_test
+
+
+#Print linkage data
+conda inspect linkages -p $PREFIX $PKG_NAME

libnnpdf/tests/experiment_test.cc

@@ -6,13 +6,15 @@
 using namespace NNPDF;
 using namespace std;
 
-TEST_CASE( "Experiment constructor", "[Experiment]" ) {
+TEST_CASE("Experiment constructor", "[Experiment]") {
 
-  const auto cd = CommonData::ReadFile( get_data_path() + "commondata/DATA_NMC.dat",
-                                        get_data_path() + "commondata/systypes/SYSTYPE_NMC_DEFAULT.dat");
+  const auto cd = CommonData::ReadFile(
+      get_data_path() + "commondata/DATA_NMC.dat",
+      get_data_path() + "commondata/systypes/SYSTYPE_NMC_DEFAULT.dat");
 
-  const auto fk = FKSet(FKSet::parseOperator("NULL"),
-                        {new FKTable{get_data_path() + "theory_53/fastkernel/FK_NMC.dat"}});
+  const auto fk = FKSet(
+      FKSet::parseOperator("NULL"),
+      {new FKTable{get_data_path() + "theory_162/fastkernel/FK_NMC.dat"}});
 
   const auto pdf = LHAPDFSet("NNPDF31_nnlo_as_0118", PDFSet::erType::ER_MCT0);
 
@@ -22,51 +24,44 @@ TEST_CASE( "Experiment constructor", "[Experiment]" ) {
   auto exp = Experiment{{dset}, "NMC"};
   auto exp2 = Experiment{exp};
 
-  REQUIRE( exp.GetNData() == exp2.GetNData() );
-  for (int i = 0; i < exp.GetNData(); i++)
-    {
-      REQUIRE( exp.GetData()[i] == exp2.GetData()[i]);
-      for (int j = 0; j < exp.GetNData(); j++)
-        REQUIRE( exp.GetCovMat()(i,j) == exp2.GetCovMat()(i,j) );
-    }
+  REQUIRE(exp.GetNData() == exp2.GetNData());
+  for (int i = 0; i < exp.GetNData(); i++) {
+    REQUIRE(exp.GetData()[i] == exp2.GetData()[i]);
+    for (int j = 0; j < exp.GetNData(); j++)
+      REQUIRE(exp.GetCovMat()(i, j) == exp2.GetCovMat()(i, j));
+  }
 
   // CHECKING T0
   exp.SetT0(pdf);
   exp2.SetT0(pdf);
 
-  for (int i = 0; i < exp.GetNData(); i++)
-    {
-      REQUIRE( exp.GetData()[i] == exp2.GetData()[i]);
-      for (int j = 0; j < exp.GetNData(); j++)
-	{
-	  REQUIRE( exp.GetCovMat()(i,j) == exp2.GetCovMat()(i,j) );
-	  REQUIRE( exp.GetSqrtCov()(i,j) == exp2.GetSqrtCov()(i,j) );
-	}
+  for (int i = 0; i < exp.GetNData(); i++) {
+    REQUIRE(exp.GetData()[i] == exp2.GetData()[i]);
+    for (int j = 0; j < exp.GetNData(); j++) {
+      REQUIRE(exp.GetCovMat()(i, j) == exp2.GetCovMat()(i, j));
+      REQUIRE(exp.GetSqrtCov()(i, j) == exp2.GetSqrtCov()(i, j));
     }
+  }
 
   // CHECKING COPY AFTER T0
   auto exp3 = Experiment{exp};
 
-  for (int i = 0; i < exp.GetNData(); i++)
-    {
-      REQUIRE( exp.GetData()[i] == exp3.GetData()[i]);
-      for (int j = 0; j < exp.GetNData(); j++)
-	{
-	  REQUIRE( exp.GetCovMat()(i,j) == exp3.GetCovMat()(i,j) );
-	  REQUIRE( exp.GetSqrtCov()(i,j) == exp3.GetSqrtCov()(i,j) );
-	}
+  for (int i = 0; i < exp.GetNData(); i++) {
+    REQUIRE(exp.GetData()[i] == exp3.GetData()[i]);
+    for (int j = 0; j < exp.GetNData(); j++) {
+      REQUIRE(exp.GetCovMat()(i, j) == exp3.GetCovMat()(i, j));
+      REQUIRE(exp.GetSqrtCov()(i, j) == exp3.GetSqrtCov()(i, j));
     }
+  }
 
   // CHECKING FURTHER SET T0
   exp3.SetT0(pdf);
 
-  for (int i = 0; i < exp.GetNData(); i++)
-    {
-      REQUIRE( exp.GetData()[i] == exp3.GetData()[i]);
-      for (int j = 0; j < exp.GetNData(); j++)
-	{
-	  REQUIRE( exp.GetCovMat()(i,j) == exp3.GetCovMat()(i,j) );
-	  REQUIRE( exp.GetSqrtCov()(i,j) == exp3.GetSqrtCov()(i,j) );
-	}
+  for (int i = 0; i < exp.GetNData(); i++) {
+    REQUIRE(exp.GetData()[i] == exp3.GetData()[i]);
+    for (int j = 0; j < exp.GetNData(); j++) {
+      REQUIRE(exp.GetCovMat()(i, j) == exp3.GetCovMat()(i, j));
+      REQUIRE(exp.GetSqrtCov()(i, j) == exp3.GetSqrtCov()(i, j));
     }
+  }
 }