[cig-commits] commit: Adding a different expected file for the libfame test on macs because the encoded file is different.

Mercurial hg at geodynamics.org
Mon Nov 24 11:28:38 PST 2008


changeset:   2:ba6b21545881
user:        RobertTurnbull
date:        Thu Apr 05 07:59:27 2007 +0000
files:       OutputFormats/tests/expected/testEncoderLibfame-darwin.0of1.window.mpeg.expected OutputFormats/tests/makefile OutputFormats/tests/testEncoderLibfame-darwin.0of1.sh
description:
Adding a different expected file for the libfame test on macs because the encoded file is different.


diff -r 28d655bec240 -r ba6b21545881 OutputFormats/tests/expected/testEncoderLibfame-darwin.0of1.window.mpeg.expected
Binary file OutputFormats/tests/expected/testEncoderLibfame-darwin.0of1.window.mpeg.expected has changed
diff -r 28d655bec240 -r ba6b21545881 OutputFormats/tests/makefile
--- a/OutputFormats/tests/makefile	Wed Apr 04 14:50:57 2007 +0000
+++ b/OutputFormats/tests/makefile	Thu Apr 05 07:59:27 2007 +0000
@@ -49,11 +49,15 @@ endif
 endif
 ifdef HAVE_LIBFAME
 
-# Run the libfame test depending of 32/64 bits. The encoded results differ slightly depending on platform
-ifeq (${SYSTEM_64},0)
+# The encoded results differ slightly depending on platform
+ifneq (${SYSTEM_64},0)
+	checks += testEncoderLibfame-64bit.0of1.sh
+else
+ifeq (${SYSTEM},Darwin)
+	checks += testEncoderLibfame-darwin.0of1.sh
+else
 	checks += testEncoderLibfame.0of1.sh
-else
-	checks += testEncoderLibfame-64bit.0of1.sh
+endif
 endif
 
 endif
diff -r 28d655bec240 -r ba6b21545881 OutputFormats/tests/testEncoderLibfame-darwin.0of1.sh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/OutputFormats/tests/testEncoderLibfame-darwin.0of1.sh	Thu Apr 05 07:59:27 2007 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+TEST_SCRIPT=./VMake/executableTester.sh
+until test -r ${TEST_SCRIPT} ; do
+        TEST_SCRIPT=../${TEST_SCRIPT}
+done
+. ${TEST_SCRIPT}
+
+runAndHandleSystemTestStdLocations "glucifer testEncoderLibfame.xml" "$0" "$@"



More information about the CIG-COMMITS mailing list