From f01ded33e29e47e0d04cca3932a22bef66a37933 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@gmail.com>
Date: Wed, 1 Jul 2009 04:58:53 +0000
Subject: Make test executables end in -test.

---
 .gitignore           |  7 +------
 tests/Makefile.am    | 38 +++++++++++++++++++-------------------
 tests/raytracexx.cpp |  2 ++
 3 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/.gitignore b/.gitignore
index 308771c..9f020a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,12 +38,7 @@ Makefile.in
 /doc/texinfo.tex
 
 # Files created by `make check'
-/tests/warning
-/tests/error
-/tests/png
-/tests/pngxx
-/tests/raytrace
-/tests/raytracexx
+/tests/*-test
 /tests/*.png
 
 # Files and folders created by libtool
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d6341e8..9e6fda4 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,14 +19,14 @@
 
 check_LTLIBRARIES = libdimension-tests.la                                      \
                     libdimensionxx-tests.la
-check_PROGRAMS    = warning                                                    \
-                    error                                                      \
-                    png                                                        \
-                    pngxx                                                      \
-                    raytrace                                                   \
-                    raytracexx
+check_PROGRAMS    = warning-test                                               \
+                    error-test                                                 \
+                    png-test                                                   \
+                    pngxx-test                                                 \
+                    raytrace-test                                              \
+                    raytracexx-test
 TESTS             = $(check_PROGRAMS)
-XFAIL_TESTS       = error
+XFAIL_TESTS       = error-test
 
 INCLUDES = -I../libdimension -I../libdimensionxx
 
@@ -38,20 +38,20 @@ libdimensionxx_tests_la_SOURCES = testsxx.hpp                                  \
                                   testsxx.cpp
 libdimensionxx_tests_la_LIBADD  = ../libdimensionxx/libdimensionxx.la
 
-warning_SOURCES    = warning.c
-warning_LDADD      = ./libdimension-tests.la
+warning_test_SOURCES    = warning.c
+warning_test_LDADD      = ./libdimension-tests.la
 
-error_SOURCES      = error.c
-error_LDADD        = ./libdimension-tests.la
+error_test_SOURCES      = error.c
+error_test_LDADD        = ./libdimension-tests.la
 
-png_SOURCES        = png.c
-png_LDADD          = ./libdimension-tests.la
+png_test_SOURCES        = png.c
+png_test_LDADD          = ./libdimension-tests.la
 
-pngxx_SOURCES      = pngxx.cpp
-pngxx_LDADD        = ./libdimensionxx-tests.la
+pngxx_test_SOURCES      = pngxx.cpp
+pngxx_test_LDADD        = ./libdimensionxx-tests.la
 
-raytrace_SOURCES   = raytrace.c
-raytrace_LDADD     = ./libdimension-tests.la
+raytrace_test_SOURCES   = raytrace.c
+raytrace_test_LDADD     = ./libdimension-tests.la
 
-raytracexx_SOURCES = raytracexx.cpp
-raytracexx_LDADD   = ./libdimensionxx-tests.la
+raytracexx_test_SOURCES = raytracexx.cpp
+raytracexx_test_LDADD   = ./libdimensionxx-tests.la
diff --git a/tests/raytracexx.cpp b/tests/raytracexx.cpp
index 2b5c4e0..0a23819 100644
--- a/tests/raytracexx.cpp
+++ b/tests/raytracexx.cpp
@@ -37,6 +37,7 @@ main() {
   std::ofstream file("raytracexx.png");
   PNG_Canvas canvas(768, 480, file);
 
+  // Camera
   Perspective_Camera camera(
     Matrix::rotation(Vector(0.0, 1.0, 0.0))
     * Matrix::translation(Vector(0.0, 0.0, -4.0))
@@ -45,6 +46,7 @@ main() {
       )
   );
 
+  // Scene
   Scene scene(background, camera, canvas);
 
   // Objects in scene
-- 
cgit v1.2.3