Index: menu/Makefile =================================================================== --- menu/Makefile (revision 33238) +++ menu/Makefile (revision 33239) @@ -1,17 +1,17 @@ all: test: - @./test_patch.sh 'MenuPatch(load, test, "insert.lht");' > insert.out + @./test_patch.sh insert.lht 'MenuPatch(load, test, "insert.lht");' > insert.out @diff insert.ref insert.out - @./test_patch.sh 'MenuPatch(load, test, "change.lht");' > change.out + @./test_patch.sh change.lht 'MenuPatch(load, test, "change.lht");' > change.out @diff change.ref change.out - @./test_patch.sh 'MenuPatch(load, test, "remove.lht");' > remove.out + @./test_patch.sh remove.lht 'MenuPatch(load, test, "remove.lht");' > remove.out @diff remove.ref remove.out - @./test_patch.sh 'MenuPatch(load, test, "overwrite_m.lht");' > overwrite_m.out + @./test_patch.sh overwrite_m.lht 'MenuPatch(load, test, "overwrite_m.lht");' > overwrite_m.out @diff overwrite_m.ref overwrite_m.out - @./test_patch.sh 'MenuPatch(load, test, "overwrite_p.lht");' > overwrite_p.out + @./test_patch.sh overwrite_p.lht 'MenuPatch(load, test, "overwrite_p.lht");' > overwrite_p.out @diff overwrite_p.ref overwrite_p.out - @./test_patch.sh 'MenuPatch(load, test, "new_submenu.lht");' > new_submenu.out + @./test_patch.sh new_submenu.lht 'MenuPatch(load, test, "new_submenu.lht");' > new_submenu.out @diff new_submenu.ref new_submenu.out clean: Index: menu/test_patch.sh =================================================================== --- menu/test_patch.sh (revision 33238) +++ menu/test_patch.sh (revision 33239) @@ -1,20 +1,30 @@ #!/bin/sh SRC=../../src -CFG="-c rc/library_search_paths=. -c rc/quiet=1" +CFG="-c rc/library_search_paths=dummy_lib -c rc/quiet=1" -# MenuPatch(load, test, "insert.lht"); +# call: +# insert.lht 'MenuPatch(load, test, "insert.lht");' -cp $SRC/default_font $SRC/default4.lht . rm d0.lht d1.lht >/dev/null 2>&1 +cp pcb-menu-base.lht $1 $SRC +( +cd $SRC +mkdir dummy_lib echo ' MenuDebug(force-enable); MenuDebug(save, "d0.lht"); -'$1' +'$2' MenuDebug(save, "d1.lht"); -' | $SRC/pcb-rnd $CFG -c rc/menu_file=base --gui batch 2>&1 | grep -v "^menu debug" +' | ./pcb-rnd $CFG -c rc/menu_file=base --gui batch 2>&1 | grep -v "^menu debug" +rmdir dummy_lib +) +mv $SRC/d0.lht . +mv $SRC/d1.lht . +rm $SRC/pcb-menu-base.lht $SRC/$1 + diff -U1 d0.lht d1.lht | grep "^[ +-][^+-]" -rm d0.lht d1.lht default_font default4.lht >/dev/null 2>&1 \ No newline at end of file +rm d0.lht d1.lht >/dev/null 2>&1