Merge pull request #2 from boyska/manipulation

Test improvement is nice :)

Author: leophys

Makefile

@@ -2,16 +2,27 @@ images_names=kodim01.png kodim02.png
 
 all: split
 images:$(addprefix testImage/,$(images_names))
+.PHONY: clean test
 
+BINS=split tests/createBlankImage
 OBJ:=split.o lib/fillwithblack.o lib/manppm.o
 EXTRACFLAGS=
 CFLAGS=-Wall $(EXTRACFLAGS)
 
+$(BINS):
+	$(CC) $(CFLAGS) -lm -o $@ $^
+
 split: $(OBJ)
-	$(CC) $(CFLAGS) -lm $(OBJ) -o $@
+tests/createBlankImage: tests/createBlankImage.o lib/fillwithblack.o lib/manppm.o
+
 
 testImage/kodim%.png:
 	wget --quiet http://r0k.us/graphics/kodak/kodak/$(notdir $@) -O $@
 
 clean:
-	rm -f $(OBJ) split
+	rm -f $(OBJ) split tests/createBlankImage
+
+
+
+test: tests/cuttest tests/createBlankImage split
+	cd $(dir $<) && bash $(notdir $<)

lib/fillwithblack.c

@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 #include "fillwithblack.h"
 
 void writePPM(const char *filename, PPMImage *img) {

tests/cuttest

@@ -12,12 +12,8 @@ function genLine {
 	tanalpha=$sign$(printf "0.%03d%02d" $(( $RANDOM % 1000 )) $(( $RANDOM % 100)))
 }
 
-function initFuncs {
-	gcc -o createBlankImg ../lib/manppm.c ../lib/fillwithblack.c createBlankImage.c -lm 2> /dev/null
-}
-
 function createVoidImage {
-	./createBlankImg -n "voidImage.ppm"
+	./createBlankImage -n "voidImage.ppm"
 }
 
 function cleanVoidImage {
@@ -40,7 +36,7 @@ function testRandomPoints {
 	y2=`shuf -i $halfheight-$height -n 1`
 	x1=`echo "$intercept+$tanalpha*$y1"|bc`
 	x2=`echo "$intercept+$tanalpha*$y2"|bc`
-	./createBlankImg -n "blankImage.ppm" -x $x1 -y $y1 -a $x2 -b $y2
+	./createBlankImage -n "blankImage.ppm" -x $x1 -y $y1 -a $x2 -b $y2
 	../split -f "blankImage.ppm" -p -s
 }
 
@@ -50,9 +46,6 @@ function testRandomPoints {
 #echo $intercept
 #echo $tanalpha
 
-# Init stuff #
-
-initFuncs
 
 # Void Image test #
 
@@ -71,13 +64,10 @@ testRandomPoints
 #echo $y2
 echo "intercept: "$intercept
 echo "tanalpha: "$tanalpha
-rm blankImage.ppm
+rm -f blankImage.ppm
 
 # Clean All #
 
-rm ../lib/fillwithblack.o ../lib/manppm.o
-rm ./createBlankImg
-
 ###################