diff --git a/.gitignore b/.gitignore
index def559c1796..746acb6a78f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -652,6 +652,7 @@ Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/poisson/*.o
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/poisson/*.sbr
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/poisson/ALL_BUILD.vcproj
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/poisson/AQtimeproject
+Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/poisson/Makefile
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/poisson/Poisson.rc.mst
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/poisson/Poisson.sln
 Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/poisson/Poisson.vcproj
diff --git a/Point_set_processing_3/examples/Point_set_processing_3/cgal_test_with_cmake b/Point_set_processing_3/examples/Point_set_processing_3/cgal_test_with_cmake
index f61abde1264..f5011efce41 100755
--- a/Point_set_processing_3/examples/Point_set_processing_3/cgal_test_with_cmake
+++ b/Point_set_processing_3/examples/Point_set_processing_3/cgal_test_with_cmake
@@ -4,7 +4,7 @@
 # This script is a modified version of cgal_test_with_cmake which:
 # - is cross-platform Unix/make and Cygwin/VisualC++
 # - concats all log files to cgal_test_with_cmake.log
-# - does not clean up object files and executables (too slow when called by developer)
+# - does not clean up object files and executables if $NEED_CLEAN==n
 #
 
 # This is a script for the CGAL test suite. Such a script must obey
@@ -16,22 +16,23 @@
 #     the second one indicates if the execution was successful
 #   if one of the two was not successful, the line should start with 'ERROR:'
 # - running the script should not require any user interaction
+# - the script should clean up object files and executables
 
   ERRORFILE=error.txt
   DO_RUN=y
   if [ -z "${MAKE_CMD}" ]; then
-    case "$CMAKE_GENERATOR" in
-      Visual* ) # if VisualC++
-          MAKE_CMD="devenv.com *.sln /Build Release /Project"
-          MAKE_CLEAN_CMD="devenv.com *.sln /Clean Release"
-          ;;
-      * ) # if make
-          MAKE_CMD="make -fMakefile"
-          MAKE_CLEAN_CMD="make -fMakefile clean"
-          ;;
-    esac
+    MAKE_CMD=make
   fi
-  NEED_CLEAN=
+  case "$CMAKE_GENERATOR" in
+    Visual* ) # if VisualC++
+        MAKE_CMD="devenv.com *.sln /Build Release /Project"
+        MAKE_CLEAN_CMD="devenv.com *.sln /Clean Release"
+        ;;
+    * ) # if make
+        MAKE_CMD="${MAKE_CMD} -fMakefile"
+        MAKE_CLEAN_CMD="${MAKE_CMD} clean"
+        ;;
+  esac
 
 #---------------------------------------------------------------------#
 #                    configure
@@ -57,11 +58,35 @@ configure()
 
 find_executable()
 {
-    PARAM_APPLICATION=""
-    [ -f ./release/$1.exe ] && PARAM_APPLICATION="./release/$1.exe"
-    [ -f ./x64/release/$1.exe ] && PARAM_APPLICATION="./x64/release/$1.exe"
-    [ -x ./$1 ] && PARAM_APPLICATION="./$1"
-    echo "$PARAM_APPLICATION"
+  PARAM_APPLICATION=""
+  [ -f ./release/$1.exe ] && PARAM_APPLICATION="./release/$1.exe"
+  [ -f ./x64/release/$1.exe ] && PARAM_APPLICATION="./x64/release/$1.exe"
+  [ -x ./$1 ] && PARAM_APPLICATION="./$1"
+  echo "$PARAM_APPLICATION"
+}
+
+#---------------------------------------------------------------------#
+#                    can_compile <target>
+#---------------------------------------------------------------------#
+
+can_compile()
+{
+  case "$CMAKE_GENERATOR" in
+    Visual* ) # if VisualC++
+        if [ -f "$1.vcproj" ]; then
+          echo y
+        else
+          echo n
+        fi
+        ;;
+    * ) # if make
+        if ${MAKE_CMD} help | grep "$1" > /dev/null; then
+          echo y
+        else
+          echo n
+        fi
+        ;;
+  esac
 }
 
 #---------------------------------------------------------------------#
@@ -136,31 +161,49 @@ if [ $# -ne 0 ] ; then
   done
 else
   echo "Run all tests."
-  compile_and_run average_spacing_example
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run grid_simplification_example
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run jet_smoothing_example
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run normal_estimation
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run normals_example
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run property_map
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run random_simplification_example
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run read_write_xyz_point_set_example
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run remove_outliers_example
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
+  if [ `can_compile average_spacing_example` == "y" ]; then
+    compile_and_run average_spacing_example
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile grid_simplification_example` == "y" ]; then
+    compile_and_run grid_simplification_example
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile jet_smoothing_example` == "y" ]; then
+    compile_and_run jet_smoothing_example
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile normal_estimation` == "y" ]; then
+    compile_and_run normal_estimation
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile normals_example` == "y" ]; then
+    compile_and_run normals_example
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile property_map` == "y" ]; then
+    compile_and_run property_map
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile random_simplification_example` == "y" ]; then
+    compile_and_run random_simplification_example
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile read_write_xyz_point_set_example` == "y" ]; then
+    compile_and_run read_write_xyz_point_set_example
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile remove_outliers_example` == "y" ]; then
+    compile_and_run remove_outliers_example
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
 fi
 
 #
 # The clean target generated by CMake under cygwin
 # always fails for some reason
 #
-if [ -n "${NEED_CLEAN}" ]; then
+if [ "${NEED_CLEAN}" == "y" ]; then
   if ! ( uname | grep -q "CYGWIN" ) ; then
     ${MAKE_CLEAN_CMD}
   fi
diff --git a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
index d71fae83175..43b10ab6e4e 100644
--- a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
+++ b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt
@@ -14,7 +14,7 @@ endif(COMMAND cmake_policy)
 include_directories (BEFORE . include ../../include)
 
 # Find CGAL
-find_package(CGAL  COMPONENTS Core )
+find_package(CGAL QUIET COMPONENTS Core )
 
 if ( CGAL_FOUND )
 
diff --git a/Point_set_processing_3/test/Point_set_processing_3/cgal_test_with_cmake b/Point_set_processing_3/test/Point_set_processing_3/cgal_test_with_cmake
index 44b887dd743..5437f105e06 100755
--- a/Point_set_processing_3/test/Point_set_processing_3/cgal_test_with_cmake
+++ b/Point_set_processing_3/test/Point_set_processing_3/cgal_test_with_cmake
@@ -4,7 +4,7 @@
 # This script is a modified version of cgal_test_with_cmake which:
 # - is cross-platform Unix/make and Cygwin/VisualC++
 # - concats all log files to cgal_test_with_cmake.log
-# - does not clean up object files and executables (too slow when called by developer)
+# - does not clean up object files and executables if $NEED_CLEAN==n
 #
 
 # This is a script for the CGAL test suite. Such a script must obey
@@ -16,22 +16,23 @@
 #     the second one indicates if the execution was successful
 #   if one of the two was not successful, the line should start with 'ERROR:'
 # - running the script should not require any user interaction
+# - the script should clean up object files and executables
 
   ERRORFILE=error.txt
   DO_RUN=y
   if [ -z "${MAKE_CMD}" ]; then
-    case "$CMAKE_GENERATOR" in
-      Visual* ) # if VisualC++
-          MAKE_CMD="devenv.com *.sln /Build Release /Project"
-          MAKE_CLEAN_CMD="devenv.com *.sln /Clean Release"
-          ;;
-      * ) # if make
-          MAKE_CMD="make -fMakefile"
-          MAKE_CLEAN_CMD="make -fMakefile clean"
-          ;;
-    esac
+    MAKE_CMD=make
   fi
-  NEED_CLEAN=
+  case "$CMAKE_GENERATOR" in
+    Visual* ) # if VisualC++
+        MAKE_CMD="devenv.com *.sln /Build Release /Project"
+        MAKE_CLEAN_CMD="devenv.com *.sln /Clean Release"
+        ;;
+    * ) # if make
+        MAKE_CMD="${MAKE_CMD} -fMakefile"
+        MAKE_CLEAN_CMD="${MAKE_CMD} clean"
+        ;;
+  esac
 
 #---------------------------------------------------------------------#
 #                    configure
@@ -57,11 +58,35 @@ configure()
 
 find_executable()
 {
-    PARAM_APPLICATION=""
-    [ -f ./release/$1.exe ] && PARAM_APPLICATION="./release/$1.exe"
-    [ -f ./x64/release/$1.exe ] && PARAM_APPLICATION="./x64/release/$1.exe"
-    [ -x ./$1 ] && PARAM_APPLICATION="./$1"
-    echo "$PARAM_APPLICATION"
+  PARAM_APPLICATION=""
+  [ -f ./release/$1.exe ] && PARAM_APPLICATION="./release/$1.exe"
+  [ -f ./x64/release/$1.exe ] && PARAM_APPLICATION="./x64/release/$1.exe"
+  [ -x ./$1 ] && PARAM_APPLICATION="./$1"
+  echo "$PARAM_APPLICATION"
+}
+
+#---------------------------------------------------------------------#
+#                    can_compile <target>
+#---------------------------------------------------------------------#
+
+can_compile()
+{
+  case "$CMAKE_GENERATOR" in
+    Visual* ) # if VisualC++
+        if [ -f "$1.vcproj" ]; then
+          echo y
+        else
+          echo n
+        fi
+        ;;
+    * ) # if make
+        if ${MAKE_CMD} help | grep "$1" > /dev/null; then
+          echo y
+        else
+          echo n
+        fi
+        ;;
+  esac
 }
 
 #---------------------------------------------------------------------#
@@ -136,21 +161,29 @@ if [ $# -ne 0 ] ; then
   done
 else
   echo "Run all tests."
-  compile_and_run analysis_test
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run normal_estimation_test
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run remove_outliers_test
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run smoothing_test
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
+  if [ `can_compile analysis_test` == "y" ]; then
+    compile_and_run analysis_test
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile normal_estimation_test` == "y" ]; then
+    compile_and_run normal_estimation_test
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile remove_outliers_test` == "y" ]; then
+    compile_and_run remove_outliers_test
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile smoothing_test` == "y" ]; then
+    compile_and_run smoothing_test
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
 fi
 
 #
 # The clean target generated by CMake under cygwin
 # always fails for some reason
 #
-if [ -n "${NEED_CLEAN}" ]; then
+if [ "${NEED_CLEAN}" == "y" ]; then
   if ! ( uname | grep -q "CYGWIN" ) ; then
     ${MAKE_CLEAN_CMD}
   fi
diff --git a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake
index 6bc5e50d849..2bc9ef62b50 100755
--- a/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake
+++ b/Surface_reconstruction_points_3/demo/Surface_reconstruction_points_3/Point_set_demo/cgal_test_with_cmake
@@ -4,7 +4,7 @@
 # This script is a modified version of cgal_test_with_cmake which:
 # - is cross-platform Unix/make and Cygwin/VisualC++
 # - concats all log files to cgal_test_with_cmake.log
-# - does not clean up object files and executables (too slow when called by developer)
+# - does not clean up object files and executables if $NEED_CLEAN==n
 #
 
 # This is a script for the CGAL test suite. Such a script must obey
@@ -16,22 +16,23 @@
 #     the second one indicates if the execution was successful
 #   if one of the two was not successful, the line should start with 'ERROR:'
 # - running the script should not require any user interaction
+# - the script should clean up object files and executables
 
   ERRORFILE=error.txt
   DO_RUN=
   if [ -z "${MAKE_CMD}" ]; then
-    case "$CMAKE_GENERATOR" in
-      Visual* ) # if VisualC++
-          MAKE_CMD="devenv.com *.sln /Build Release /Project"
-          MAKE_CLEAN_CMD="devenv.com *.sln /Clean Release"
-          ;;
-      * ) # if make
-          MAKE_CMD="make -fMakefile"
-          MAKE_CLEAN_CMD="make -fMakefile clean"
-          ;;
-    esac
+    MAKE_CMD=make
   fi
-  NEED_CLEAN=
+  case "$CMAKE_GENERATOR" in
+    Visual* ) # if VisualC++
+        MAKE_CMD="devenv.com *.sln /Build Release /Project"
+        MAKE_CLEAN_CMD="devenv.com *.sln /Clean Release"
+        ;;
+    * ) # if make
+        MAKE_CMD="${MAKE_CMD} -fMakefile"
+        MAKE_CLEAN_CMD="${MAKE_CMD} clean"
+        ;;
+  esac
 
 #---------------------------------------------------------------------#
 #                    configure
@@ -57,11 +58,35 @@ configure()
 
 find_executable()
 {
-    PARAM_APPLICATION=""
-    [ -f ./release/$1.exe ] && PARAM_APPLICATION="./release/$1.exe"
-    [ -f ./x64/release/$1.exe ] && PARAM_APPLICATION="./x64/release/$1.exe"
-    [ -x ./$1 ] && PARAM_APPLICATION="./$1"
-    echo "$PARAM_APPLICATION"
+  PARAM_APPLICATION=""
+  [ -f ./release/$1.exe ] && PARAM_APPLICATION="./release/$1.exe"
+  [ -f ./x64/release/$1.exe ] && PARAM_APPLICATION="./x64/release/$1.exe"
+  [ -x ./$1 ] && PARAM_APPLICATION="./$1"
+  echo "$PARAM_APPLICATION"
+}
+
+#---------------------------------------------------------------------#
+#                    can_compile <target>
+#---------------------------------------------------------------------#
+
+can_compile()
+{
+  case "$CMAKE_GENERATOR" in
+    Visual* ) # if VisualC++
+        if [ -f "$1.vcproj" ]; then
+          echo y
+        else
+          echo n
+        fi
+        ;;
+    * ) # if make
+        if ${MAKE_CMD} help | grep "$1" > /dev/null; then
+          echo y
+        else
+          echo n
+        fi
+        ;;
+  esac
 }
 
 #---------------------------------------------------------------------#
@@ -136,15 +161,17 @@ if [ $# -ne 0 ] ; then
   done
 else
   echo "Run all tests."
-  compile_and_run Point_set_demo
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
+  if [ `can_compile Point_set_demo` == "y" ]; then
+    compile_and_run Point_set_demo
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
 fi
 
 #
 # The clean target generated by CMake under cygwin
 # always fails for some reason
 #
-if [ -n "${NEED_CLEAN}" ]; then
+if [ "${NEED_CLEAN}" == "y" ]; then
   if ! ( uname | grep -q "CYGWIN" ) ; then
     ${MAKE_CLEAN_CMD}
   fi
diff --git a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake
index 89e66e4979e..408b578fd7b 100644
--- a/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake
+++ b/Surface_reconstruction_points_3/examples/Surface_reconstruction_points_3/cgal_test_with_cmake
@@ -4,7 +4,7 @@
 # This script is a modified version of cgal_test_with_cmake which:
 # - is cross-platform Unix/make and Cygwin/VisualC++
 # - concats all log files to cgal_test_with_cmake.log
-# - does not clean up object files and executables (too slow when called by developer)
+# - does not clean up object files and executables if $NEED_CLEAN==n
 #
 
 # This is a script for the CGAL test suite. Such a script must obey
@@ -16,22 +16,23 @@
 #     the second one indicates if the execution was successful
 #   if one of the two was not successful, the line should start with 'ERROR:'
 # - running the script should not require any user interaction
+# - the script should clean up object files and executables
 
   ERRORFILE=error.txt
   DO_RUN=y
   if [ -z "${MAKE_CMD}" ]; then
-    case "$CMAKE_GENERATOR" in
-      Visual* ) # if VisualC++
-          MAKE_CMD="devenv.com *.sln /Build Release /Project"
-          MAKE_CLEAN_CMD="devenv.com *.sln /Clean Release"
-          ;;
-      * ) # if make
-          MAKE_CMD="make -fMakefile"
-          MAKE_CLEAN_CMD="make -fMakefile clean"
-          ;;
-    esac
+    MAKE_CMD=make
   fi
-  NEED_CLEAN=
+  case "$CMAKE_GENERATOR" in
+    Visual* ) # if VisualC++
+        MAKE_CMD="devenv.com *.sln /Build Release /Project"
+        MAKE_CLEAN_CMD="devenv.com *.sln /Clean Release"
+        ;;
+    * ) # if make
+        MAKE_CMD="${MAKE_CMD} -fMakefile"
+        MAKE_CLEAN_CMD="${MAKE_CMD} clean"
+        ;;
+  esac
 
 #---------------------------------------------------------------------#
 #                    configure
@@ -57,11 +58,35 @@ configure()
 
 find_executable()
 {
-    PARAM_APPLICATION=""
-    [ -f ./release/$1.exe ] && PARAM_APPLICATION="./release/$1.exe"
-    [ -f ./x64/release/$1.exe ] && PARAM_APPLICATION="./x64/release/$1.exe"
-    [ -x ./$1 ] && PARAM_APPLICATION="./$1"
-    echo "$PARAM_APPLICATION"
+  PARAM_APPLICATION=""
+  [ -f ./release/$1.exe ] && PARAM_APPLICATION="./release/$1.exe"
+  [ -f ./x64/release/$1.exe ] && PARAM_APPLICATION="./x64/release/$1.exe"
+  [ -x ./$1 ] && PARAM_APPLICATION="./$1"
+  echo "$PARAM_APPLICATION"
+}
+
+#---------------------------------------------------------------------#
+#                    can_compile <target>
+#---------------------------------------------------------------------#
+
+can_compile()
+{
+  case "$CMAKE_GENERATOR" in
+    Visual* ) # if VisualC++
+        if [ -f "$1.vcproj" ]; then
+          echo y
+        else
+          echo n
+        fi
+        ;;
+    * ) # if make
+        if ${MAKE_CMD} help | grep "$1" > /dev/null; then
+          echo y
+        else
+          echo n
+        fi
+        ;;
+  esac
 }
 
 #---------------------------------------------------------------------#
@@ -136,19 +161,29 @@ if [ $# -ne 0 ] ; then
   done
 else
   echo "Run all tests."
-  compile_and_run APSS_reconstruction
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run poisson_reconstruction
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run poisson_reconstruction_example
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
+  if [ `can_compile APSS_reconstruction` == "y" ]; then
+    compile_and_run APSS_reconstruction
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile APSS_reconstruction_example` == "y" ]; then
+    compile_and_run APSS_reconstruction_example
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile poisson_reconstruction` == "y" ]; then
+    compile_and_run poisson_reconstruction
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile poisson_reconstruction_example` == "y" ]; then
+    compile_and_run poisson_reconstruction_example
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
 fi
 
 #
 # The clean target generated by CMake under cygwin
 # always fails for some reason
 #
-if [ -n "${NEED_CLEAN}" ]; then
+if [ "${NEED_CLEAN}" == "y" ]; then
   if ! ( uname | grep -q "CYGWIN" ) ; then
     ${MAKE_CLEAN_CMD}
   fi
diff --git a/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/cgal_test_with_cmake b/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/cgal_test_with_cmake
index 0f1b11b531e..935c5eb3216 100644
--- a/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/cgal_test_with_cmake
+++ b/Surface_reconstruction_points_3/test/Surface_reconstruction_points_3/cgal_test_with_cmake
@@ -4,7 +4,7 @@
 # This script is a modified version of cgal_test_with_cmake which:
 # - is cross-platform Unix/make and Cygwin/VisualC++
 # - concats all log files to cgal_test_with_cmake.log
-# - does not clean up object files and executables (too slow when called by developer)
+# - does not clean up object files and executables if $NEED_CLEAN==n
 #
 
 # This is a script for the CGAL test suite. Such a script must obey
@@ -16,22 +16,23 @@
 #     the second one indicates if the execution was successful
 #   if one of the two was not successful, the line should start with 'ERROR:'
 # - running the script should not require any user interaction
+# - the script should clean up object files and executables
 
   ERRORFILE=error.txt
   DO_RUN=y
   if [ -z "${MAKE_CMD}" ]; then
-    case "$CMAKE_GENERATOR" in
-      Visual* ) # if VisualC++
-          MAKE_CMD="devenv.com *.sln /Build Release /Project"
-          MAKE_CLEAN_CMD="devenv.com *.sln /Clean Release"
-          ;;
-      * ) # if make
-          MAKE_CMD="make -fMakefile"
-          MAKE_CLEAN_CMD="make -fMakefile clean"
-          ;;
-    esac
+    MAKE_CMD=make
   fi
-  NEED_CLEAN=
+  case "$CMAKE_GENERATOR" in
+    Visual* ) # if VisualC++
+        MAKE_CMD="devenv.com *.sln /Build Release /Project"
+        MAKE_CLEAN_CMD="devenv.com *.sln /Clean Release"
+        ;;
+    * ) # if make
+        MAKE_CMD="${MAKE_CMD} -fMakefile"
+        MAKE_CLEAN_CMD="${MAKE_CMD} clean"
+        ;;
+  esac
 
 #---------------------------------------------------------------------#
 #                    configure
@@ -57,11 +58,35 @@ configure()
 
 find_executable()
 {
-    PARAM_APPLICATION=""
-    [ -f ./release/$1.exe ] && PARAM_APPLICATION="./release/$1.exe"
-    [ -f ./x64/release/$1.exe ] && PARAM_APPLICATION="./x64/release/$1.exe"
-    [ -x ./$1 ] && PARAM_APPLICATION="./$1"
-    echo "$PARAM_APPLICATION"
+  PARAM_APPLICATION=""
+  [ -f ./release/$1.exe ] && PARAM_APPLICATION="./release/$1.exe"
+  [ -f ./x64/release/$1.exe ] && PARAM_APPLICATION="./x64/release/$1.exe"
+  [ -x ./$1 ] && PARAM_APPLICATION="./$1"
+  echo "$PARAM_APPLICATION"
+}
+
+#---------------------------------------------------------------------#
+#                    can_compile <target>
+#---------------------------------------------------------------------#
+
+can_compile()
+{
+  case "$CMAKE_GENERATOR" in
+    Visual* ) # if VisualC++
+        if [ -f "$1.vcproj" ]; then
+          echo y
+        else
+          echo n
+        fi
+        ;;
+    * ) # if make
+        if ${MAKE_CMD} help | grep "$1" > /dev/null; then
+          echo y
+        else
+          echo n
+        fi
+        ;;
+  esac
 }
 
 #---------------------------------------------------------------------#
@@ -136,17 +161,21 @@ if [ $# -ne 0 ] ; then
   done
 else
   echo "Run all tests."
-  compile_and_run APSS_reconstruction_test
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
-  compile_and_run poisson_reconstruction_test
-  NEED_CLEAN=  # Do *not* call make clean (too slow when called by developer)
+  if [ `can_compile APSS_reconstruction_test` == "y" ]; then
+    compile_and_run APSS_reconstruction_test
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
+  if [ `can_compile poisson_reconstruction_test` == "y" ]; then
+    compile_and_run poisson_reconstruction_test
+    [ -z "${NEED_CLEAN}" ] && NEED_CLEAN=y
+  fi
 fi
 
 #
 # The clean target generated by CMake under cygwin
 # always fails for some reason
 #
-if [ -n "${NEED_CLEAN}" ]; then
+if [ "${NEED_CLEAN}" == "y" ]; then
   if ! ( uname | grep -q "CYGWIN" ) ; then
     ${MAKE_CLEAN_CMD}
   fi