Improve unit tests
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@126 632fc199-4ca6-4c93-a231-07263d6284db
diff --git a/Makefile.am b/Makefile.am
index 0a8c3aa..bd5a51c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,18 +95,24 @@
test: testclean cjpeg djpeg jpegtran
./jpegut
- ./djpeg -dct int -ppm -outfile testout.ppm $(srcdir)/testorig.jpg
+ ./cjpeg -dct int -outfile testoutint.jpg $(srcdir)/testorig.ppm
+ ./cjpeg -dct fast -opt -outfile testoutfst.jpg $(srcdir)/testorig.ppm
+ ./cjpeg -dct float -outfile testoutflt.jpg $(srcdir)/testorig.ppm
+ cmp $(srcdir)/testimgint.jpg testoutint.jpg
+ cmp $(srcdir)/testimgfst.jpg testoutfst.jpg
+ cmp $(srcdir)/testimgflt.jpg testoutflt.jpg
+ ./djpeg -dct int -fast -ppm -outfile testoutint.ppm $(srcdir)/testorig.jpg
+ ./djpeg -dct fast -ppm -outfile testoutfst.ppm $(srcdir)/testorig.jpg
+ ./djpeg -dct float -ppm -outfile testoutflt.ppm $(srcdir)/testorig.jpg
+ cmp $(srcdir)/testimgint.ppm testoutint.ppm
+ cmp $(srcdir)/testimgfst.ppm testoutfst.ppm
+ cmp $(srcdir)/testorig.ppm testoutflt.ppm
./djpeg -dct int -bmp -colors 256 -outfile testout.bmp $(srcdir)/testorig.jpg
- ./cjpeg -dct int -outfile testout.jpg $(srcdir)/testimg.ppm
- ./djpeg -dct int -ppm -outfile testoutp.ppm $(srcdir)/testprog.jpg
- ./cjpeg -dct int -progressive -opt -outfile testoutp.jpg $(srcdir)/testimg.ppm
- ./jpegtran -outfile testoutt.jpg $(srcdir)/testprog.jpg
- cmp $(srcdir)/testimg.ppm testout.ppm
cmp $(srcdir)/testimg.bmp testout.bmp
- cmp $(srcdir)/testimg.jpg testout.jpg
- cmp $(srcdir)/testimg.ppm testoutp.ppm
+ ./cjpeg -dct int -progressive -outfile testoutp.jpg $(srcdir)/testorig.ppm
cmp $(srcdir)/testimgp.jpg testoutp.jpg
- cmp $(srcdir)/testorig.jpg testoutt.jpg
+ ./jpegtran -outfile testoutt.jpg testoutp.jpg
+ cmp $(srcdir)/testimgint.jpg testoutt.jpg
testclean:
$(RM) testout*
diff --git a/testimg.jpg b/testimg.jpg
deleted file mode 100644
index 76d223f..0000000
--- a/testimg.jpg
+++ /dev/null
Binary files differ
diff --git a/testimgflt.jpg b/testimgflt.jpg
new file mode 100644
index 0000000..540388e
--- /dev/null
+++ b/testimgflt.jpg
Binary files differ
diff --git a/testimgfst.jpg b/testimgfst.jpg
new file mode 100644
index 0000000..efd9abf
--- /dev/null
+++ b/testimgfst.jpg
Binary files differ
diff --git a/testimgint.jpg b/testimgint.jpg
new file mode 100644
index 0000000..518601f
--- /dev/null
+++ b/testimgint.jpg
Binary files differ
diff --git a/testimgint.ppm b/testimgint.ppm
new file mode 100644
index 0000000..59c50a8
--- /dev/null
+++ b/testimgint.ppm
Binary files differ
diff --git a/testimgp.jpg b/testimgp.jpg
index b78f6d0..684f051 100644
--- a/testimgp.jpg
+++ b/testimgp.jpg
Binary files differ
diff --git a/testimg.ppm b/testorig.ppm
similarity index 65%
rename from testimg.ppm
rename to testorig.ppm
index b391684..6de0495 100644
--- a/testimg.ppm
+++ b/testorig.ppm
Binary files differ
diff --git a/testprog.jpg b/testprog.jpg
deleted file mode 100644
index 920fee2..0000000
--- a/testprog.jpg
+++ /dev/null
Binary files differ
