Merge branch 'fix/test-el2p-if-no-pdelab' into 'master'

[el2p] Fix the test if pdelab is not present

The test has to have a main function. The test should
be skipped if pdelab is not present.

See merge request !35

test/geomechanics/el2p/test_el2p.cc

@@ -23,11 +23,11 @@
  */
 #include <config.h>
 
-#if HAVE_DUNE_PDELAB
-
 #include <dune/common/precision.hh>
 #include <dune/common/version.hh>
+#if HAVE_DUNE_PDELAB
 #include "el2pproblem.hh"
+#endif
 #include <dumux/common/start.hh>
 
 /*!
@@ -63,13 +63,13 @@ void usage(const char *progName, const std::string &errorMsg)
 ////////////////////////
 int main(int argc, char** argv)
 {
+#if HAVE_DUNE_PDELAB
     typedef TTAG(El2P_TestProblem) TypeTag;
     return Dumux::start<TypeTag>(argc, argv, usage);
-}
-
 
 #else // HAVE_DUNE_PDELAB
-
-#warning You need to have dune-pdelab installed and patched to run this test.
-
+#warning You need to have dune-pdelab to run this test.
+    std::cerr << "You need to have dune-pdelab to run this test." << std::endl;
+    return 77;
 #endif // HAVE_DUNE_PDELAB
+}