Commit c2841e90 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

parsing python error output in cocotb simulation

parent bed95aed

src/com/elphel/vdt/core/launching/VDTRunner.java

+17 −9
Original line number Original line Diff line number Diff line
@@ -104,6 +104,7 @@ public class VDTRunner { 
	

	

	public void abortLaunch(String consoleName){

	public void abortLaunch(String consoleName){

		final VDTRunnerConfiguration runConfig=runningBuilds.resumeConfiguration(consoleName);

		final VDTRunnerConfiguration runConfig=runningBuilds.resumeConfiguration(consoleName);

		try {

			Tool tool=ToolsCore.getTool(runConfig.getToolName()); // null pointer with Icarus/gtkwave - seems it is already closed sometimes

			Tool tool=ToolsCore.getTool(runConfig.getToolName()); // null pointer with Icarus/gtkwave - seems it is already closed sometimes

			tool.setDirty(false);

			tool.setDirty(false);

			tool.setState(TOOL_STATE.FAILURE);

			tool.setState(TOOL_STATE.FAILURE);
@@ -112,8 +113,15 @@ public class VDTRunner { 
			tool.setMode(TOOL_MODE.STOP);

			tool.setMode(TOOL_MODE.STOP);

	//		tool.setTimeStamp(); // will set at start

	//		tool.setTimeStamp(); // will set at start

			tool.toolFinished();

			tool.toolFinished();

		} catch (NullPointerException npe){

			System.out.println("VDTRunner#abortLaunch("+consoleName+"), tool= null, threadID="+Thread.currentThread().getId());

		}

		//removeConfiguration

		//removeConfiguration

		runningBuilds.removeConfiguration(runConfig.getOriginalConsoleName());

		try {

			runningBuilds.removeConfiguration(runConfig.getOriginalConsoleName()); // null pointer here

		} catch (NullPointerException npe){

			System.out.println("VDTRunner#abortLaunch("+consoleName+")???, tool= null, threadID="+Thread.currentThread().getId());

		}

	}

	}





    public void resumeLaunch(String consoleName, int expectedStep) throws CoreException {

    public void resumeLaunch(String consoleName, int expectedStep) throws CoreException {

tools/Verilog/Cocotb.xml

+3 −3
Original line number Original line Diff line number Diff line
@@ -116,12 +116,12 @@ 
		package="FPGA_package"

		package="FPGA_package"

		interface="Cocotb"

		interface="Cocotb"

		errors="(.*):([0-9]+): [a-z_\- ]*error[: ]?(.*)"

		errors="(.*):([0-9]+): [a-z_\- ]*error[: ]?(.*)"

		warnings="(.*):([0-9]+): [a-z_\- ]*warning: (.*)"

		warnings="(.*):([0-9]+): [a-z_\- ]*[warning|sorry]: (.*)"

		info="(.*):([0-9]+): [a-z_\-  ]*sorry: (.*)"

		info="\s*File\s+"(.*)", line ([0-9]+)[, in ]?(.*)"

		top-file="%CocotbDutTopFile"

		top-file="%CocotbDutTopFile"

		define="COCOTB"

		define="COCOTB"

		>

		>



<!-- 		info="(.*):([0-9]+): [a-z_\-  ]*sorry: (.*)" -->

		<extensions-list>

		<extensions-list>

			<extension mask="v" />

			<extension mask="v" />

			<extension mask="tf" />

			<extension mask="tf" />