Update to the Makefile.in from Max Chen to correct an issue with the previous commit. xschem test files now all include the correct library from the top.
diff --git a/sky130/Makefile.in b/sky130/Makefile.in index 629909b..acc5c75 100644 --- a/sky130/Makefile.in +++ b/sky130/Makefile.in
@@ -696,6 +696,14 @@ if test "x${XSCHEM_PATH}" != "x" ; then \ cp -rp ${XSCHEM_PATH}/* ${XSCHEM_STAGING_A} ; \ fi + + #add the correct libraries into the test files + for file in ${XSCHEM_STAGING_A}/sky130_tests/* ; do \ + ${SED} -i '/.include \\\\\\\\$$\:\:SKYWATER_MODELS/d' $$file ; \ + grep -zl 'sky130.lib.spice' $$file || ${SED} -z 's|format="tcleval( @value )"\nvalue="|format="tcleval( @value )"\nvalue="\n.lib \\\\\\\\$$\:\:SKYWATER_MODELS\\\\\\\\/sky130.lib.spice tt |' -i $$file ; \ + grep -zl 'format="tcleval( @value )".*value="' $$file || printf 'C {devices/code.sym} -170 0 0 0 {name=TT_MODELS\nonly_toplevel=true\nformat="tcleval( @value )"\nvalue="\n.lib \\\\\\\\$$\:\:SKYWATER_MODELS\\\\\\\\/sky130.lib.spice tt\n"}' >> $$file ; \ + done + # Re-copy the xschemrc, with one change to add the PDK install path as # a component of XSCHEM_LIBRARY_PATH cat ${XSCHEM_PATH}/xschemrc | \