7 files changed, 27 insertions, 12 deletions
diff --git a/Build/source/texk/web2c/omegafonts/ChangeLog b/Build/source/texk/web2c/omegafonts/ChangeLog
index dd3d4dbabcf..17d50eb8fdb 100644
--- a/Build/source/texk/web2c/omegafonts/ChangeLog
+++ b/Build/source/texk/web2c/omegafonts/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-04  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* omfonts.c (main): Call kpse_set_program_name() with args
+	argv[0] and name_program, not name_program and NULL to avoid
+	lstat warnings.
+
+	* charwd.test, level1.test, omfonts.test, repeat.test,
+	specialhex.test: Always set TEXMFCNF to avoid warnings.
+
 2011-02-15  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am [WIN32]: Add o??2o??.exe wrappers.
diff --git a/Build/source/texk/web2c/omegafonts/charwd.test b/Build/source/texk/web2c/omegafonts/charwd.test
index 918c4611efc..e0881a6f570 100755
--- a/Build/source/texk/web2c/omegafonts/charwd.test
+++ b/Build/source/texk/web2c/omegafonts/charwd.test
@@ -1,13 +1,14 @@
 #! /bin/sh
 
-# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 test -d tests || mkdir -p tests
 
 grep -v 'CHARWD R' $srcdir/tests/charwd-r.pl >tests/charwdr.pl
 
-./omfonts -opl2ofm tests/charwdr.pl tests/charwdr.tfm || exit 1
+TEXMFCNF=$srcdir/../../kpathsea \
+  ./omfonts -opl2ofm tests/charwdr.pl tests/charwdr.tfm || exit 1
 
 TEXMFCNF=$srcdir/../../kpathsea \
   TFMFONTS=tests \
@@ -17,7 +18,8 @@ diff $srcdir/tests/charwd-r.pl tests/charwdr.xpl || exit 1
 
 grep -v 'CHARWD R' $srcdir/tests/charwd-v.vpl >tests/charwdv.vpl
 
-./omfonts -ovp2ovf tests/charwdv.vpl tests/charwdv.vf tests/charwdv.tfm || exit 1
+TEXMFCNF=$srcdir/../../kpathsea \
+  ./omfonts -ovp2ovf tests/charwdv.vpl tests/charwdv.vf tests/charwdv.tfm || exit 1
 
 TEXMFCNF=$srcdir/../../kpathsea \
   TFMFONTS=tests \
diff --git a/Build/source/texk/web2c/omegafonts/level1.test b/Build/source/texk/web2c/omegafonts/level1.test
index d3609ba1e2e..21f7a4c64d2 100755
--- a/Build/source/texk/web2c/omegafonts/level1.test
+++ b/Build/source/texk/web2c/omegafonts/level1.test
@@ -1,11 +1,12 @@
 #! /bin/sh
 
-# Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 test -d tests || mkdir -p tests
 
-./omfonts -opl2ofm -verbose $srcdir/tests/level1 tests/xlevel1 || exit 1
+TEXMFCNF=$srcdir/../../kpathsea \
+  ./omfonts -opl2ofm -verbose $srcdir/tests/level1 tests/xlevel1 || exit 1
 
 TEXMFCNF=$srcdir/../../kpathsea \
   ./omfonts -ofm2opl -verbose tests/xlevel1 tests/xlevel1 || exit 1
diff --git a/Build/source/texk/web2c/omegafonts/omfonts.c b/Build/source/texk/web2c/omegafonts/omfonts.c
index 971b640ccbe..28a516ada1f 100644
--- a/Build/source/texk/web2c/omegafonts/omfonts.c
+++ b/Build/source/texk/web2c/omegafonts/omfonts.c
@@ -230,7 +230,7 @@ main (int argc, string *argv)
     }
 
     name_program = names_program[program];
-    kpse_set_program_name(name_program, NULL);
+    kpse_set_program_name(argv[0], name_program);
     kpse_init_prog(uppercasify(name_program), 0, nil, nil);
 
     if (((argc-optind) > no_files) || ((argc-optind) < 1)) {
diff --git a/Build/source/texk/web2c/omegafonts/omfonts.test b/Build/source/texk/web2c/omegafonts/omfonts.test
index 7e5169fa769..a5ef9f2f31d 100755
--- a/Build/source/texk/web2c/omegafonts/omfonts.test
+++ b/Build/source/texk/web2c/omegafonts/omfonts.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 test -d tests || mkdir -p tests
@@ -19,7 +19,8 @@ TEXMFCNF=$srcdir/../../kpathsea \
 TEXMFCNF=$srcdir/../../kpathsea \
   ./omfonts -ofm2opl -verbose tests/OCherokee tests/OCherokee || exit 1
 
-./omfonts -opl2ofm -verbose tests/OCherokee tests/xOCherokee || exit 1
+TEXMFCNF=$srcdir/../../kpathsea \
+  ./omfonts -opl2ofm -verbose tests/OCherokee tests/xOCherokee || exit 1
 
 TEXMFCNF=$srcdir/../../kpathsea \
   ./omfonts -ofm2opl -verbose tests/xOCherokee tests/xOCherokee || exit 1
diff --git a/Build/source/texk/web2c/omegafonts/repeat.test b/Build/source/texk/web2c/omegafonts/repeat.test
index 9af4db462bc..2f3f31d2554 100755
--- a/Build/source/texk/web2c/omegafonts/repeat.test
+++ b/Build/source/texk/web2c/omegafonts/repeat.test
@@ -1,11 +1,12 @@
 #! /bin/sh
 
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 test -d tests || mkdir -p tests
 
-./omfonts -opl2ofm -verbose $srcdir/tests/repeat tests/xrepeated || exit 1
+TEXMFCNF=$srcdir/../../kpathsea \
+  ./omfonts -opl2ofm -verbose $srcdir/tests/repeat tests/xrepeated || exit 1
 
 TEXMFCNF=$srcdir/../../kpathsea \
   ./omfonts -ofm2opl -verbose tests/xrepeated tests/xrepeated || exit 1
diff --git a/Build/source/texk/web2c/omegafonts/specialhex.test b/Build/source/texk/web2c/omegafonts/specialhex.test
index 1b3499463b9..1b758919344 100755
--- a/Build/source/texk/web2c/omegafonts/specialhex.test
+++ b/Build/source/texk/web2c/omegafonts/specialhex.test
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009, 2011 Peter Breitenlohner <tex-live@tug.org>
 # You may freely use, modify and/or distribute this file.
 
 test -d tests || mkdir -p tests
@@ -12,7 +12,8 @@ TEXMFCNF=$srcdir/../../kpathsea \
 TEXMFCNF=$srcdir/../../kpathsea \
   ./omfonts -ofm2opl -verbose tests/specialhex tests/specialhex || exit 1
 
-./omfonts -opl2ofm -verbose tests/specialhex tests/xspecialhex || exit 1
+TEXMFCNF=$srcdir/../../kpathsea \
+  ./omfonts -opl2ofm -verbose tests/specialhex tests/xspecialhex || exit 1
 
 TEXMFCNF=$srcdir/../../kpathsea \
   ./omfonts -ofm2opl -verbose tests/xspecialhex tests/xspecialhex || exit 1