X-Git-Url: http://git.asbjorn.biz/?p=swftools.git;a=blobdiff_plain;f=src%2Ftestswfc;h=126ccc92692aafcad8aac99624119b10ecff0f59;hp=1c9d532dc923fbd5ce1229ca8b3ea8b717a7a603;hb=c63b2bf21dc1df9a736f0b4c08f6cba828cdab92;hpb=963e5aae7c2083cbf3eedc799a91f15b3da1f881

diff --git a/src/testswfc b/src/testswfc
index 1c9d532..126ccc9 100755
--- a/src/testswfc
+++ b/src/testswfc
@@ -5,9 +5,9 @@ testswffile() {
     test -f $1 || (touch failed;echo -n "not there" >&5;return;)
     echo
     echo -n "testing $1 for wellformedness..."
-    swfdump $1 | tail -n 1 | grep '\b0 END\b' >&6 2>&6 || (touch failed;echo -n "wrong end";return;)
-    swfdump $1 | grep 'rfxswf|warning|error|bounds' >&6 2>&6 && (touch failed;echo -n "error";return;)
-    swfdump $1 2>&1 >&6 | grep '^.*$' >&6 2>&6 && (touch failed;echo -n "swfdump stderr";swfdump $1 >&6 2>&5;return;)
+    ./swfdump $1 | tail -n 1 | grep '\b0 END\b' >&6 2>&6 || (touch failed;echo -n "wrong end";return;)
+    ./swfdump $1 | grep 'rfxswf|warning|error|bounds' >&6 2>&6 && (touch failed;echo -n "error";return;)
+    ./swfdump $1 2>&1 >&6 | grep '^.*$' >&6 2>&6 && (touch failed;echo -n "swfdump stderr";./swfdump $1 >&6 2>&5;return;)
     echo
 }
 showresult() {
@@ -35,12 +35,12 @@ swfc() {
     rm -f test.s test.s2 2>&6
 }
 
-swfc=../swfc
+swfc=./swfc
 
 starttest sprite1
 rm -f output.swf
 cat > test.sc <<EOF
-.swf
+.flash
     .sprite s1
 	.sprite s2
 	.end
@@ -56,7 +56,7 @@ showresult
 starttest sprite2
 rm -f file1.swf file2.swf
 cat > test.sc <<EOF
-.swf name="file2.swf"
+.flash name="file2.swf"
 .sprite spr1
 .end
 .end
@@ -73,7 +73,7 @@ showresult
 starttest args
 rm -f file.swf output.swf
 cat > test.sc <<EOF
-.swf
+.flash
 .box mybox 100 100
 .put mybox end #should cause an error
 .end
@@ -86,7 +86,7 @@ showresult
 starttest noend
 rm -f file.swf output.swf
 cat > test.sc <<EOF
-.swf
+.flash
 EOF
 showfile test.sc
 swfc test.sc
@@ -103,10 +103,10 @@ swfc test.sc
 test -f output.swf && touch failed
 showresult
 
-starttest swc
+starttest cws
 rm -f output.swf
 cat > test.sc <<EOF
-.swf compress
+.flash compress
     .box mybox1 100 100
     .box mybox2 100 100
 .end
@@ -114,7 +114,7 @@ EOF
 showfile test.sc
 swfc test.sc
 testswffile output.swf
-swfdump output.swf | grep 'File is zlib compressed' >&6 2>&6 || touch failed
+./swfdump output.swf | grep 'File is zlib compressed' >&6 2>&6 || touch failed
 showresult
 
 starttest nostart2
@@ -131,7 +131,7 @@ showresult
 starttest nobrackets
 rm -f output.swf
 cat > test.sc <<EOF
-.swf
+.flash
 .box box 100 100
 .put box pin=0,0
 .end
@@ -141,5 +141,19 @@ swfc test.sc
 test -f output.swf && touch failed
 showresult
 
+starttest nofont
+rm -f output.swf
+cat > test.sc <<EOF
+.flash
+    .font f1 "not_there.swf"
+    .text t1 font=f1 text="test"
+.end
+EOF
+showfile test.sc
+swfc test.sc
+ls -l output.swf >&5
+test -f output.swf && touch failed
+showresult
+
 echo -n '' >&4
 rm -f test.sc failed file1.swf file2.swf output.swf