TheCloud/Digital
1
0
Fork 0
mirror of https://github.com/hneemann/Digital.git synced 2025-09-19 09:54:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

made ghdl tests more clear

Browse Source
This commit is contained in:
hneemann 2017-08-21 11:44:12 +02:00
parent ac197c44fe
commit 4abbad3032
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/dig/processor/VHDLExample.dig
View File

@ -390,7 +390,7 @@ end loop
</testData>
</entry>
</elementAttributes>
<pos x="540" y="480"/>
<pos x="500" y="460"/>
</visualElement>
<visualElement>
<elementName>In</elementName>

28
src/test/java/de/neemann/digital/hdl/vhdl/TestInSimulator.java
View File

@ -7,7 +7,6 @@ import de.neemann.digital.draw.library.ElementNotFoundException;
import de.neemann.digital.hdl.model.HDLException;
import de.neemann.digital.hdl.model.HDLModel;
import de.neemann.digital.hdl.printer.CodePrinter;
import de.neemann.digital.hdl.printer.CodePrinterStr;
import de.neemann.digital.integration.FileScanner;
import de.neemann.digital.integration.Resources;
import de.neemann.digital.integration.ToBreakRunner;
@ -36,41 +35,42 @@ public class TestInSimulator extends TestCase {
public void testInSimulator() throws Exception {
File examples = new File(Resources.getRoot(), "/dig/test/vhdl");
int tested = new FileScanner(this::check).scan(examples);
// if tested is negative, ghdl was not found and tests are skipped!
if (tested >= 0) {
try {
int tested = new FileScanner(this::check).scan(examples);
assertEquals(15, tested);
assertEquals(tested, testBenches);
} catch (FileScanner.SkipAllException e) {
// if ghdl is not installed its also ok
}
}
public void testInSimulator2() throws Exception {
File examples = new File(Resources.getRoot(), "/dig/hdl");
int tested = new FileScanner(this::check).scan(examples);
// if tested is negative, ghdl was not found and tests are skipped!
if (tested >= 0)
try {
int tested = new FileScanner(this::check).scan(examples);
assertEquals(24, tested);
} catch (FileScanner.SkipAllException e) {
// if ghdl is not installed its also ok
}
}
public void testDistributedInSimulator() throws Exception {
File examples = new File(Resources.getRoot(), "../../main/dig/vhdl");
int tested = new FileScanner(this::check).scan(examples);
// if tested is negative, ghdl was not found and tests are skipped!
if (tested >= 0) {
try {
int tested = new FileScanner(this::check).scan(examples);
assertEquals(1, tested);
assertEquals(1, testBenches);
} catch (FileScanner.SkipAllException e) {
// if ghdl is not installed its also ok
}
}
public void testProcessorInSimulator() throws Exception {
File file = new File(Resources.getRoot(), "../../main/dig/processor/VHDLExample.dig");
try {
// ToBreakRunner br = new ToBreakRunner(file);
// System.out.println(new VHDLExporter(br.getLibrary(), new CodePrinterStr(true)).export(br.getCircuit()));
check(file);
} catch (FileScanner.SkipAllException e) {
// ok if ghdl is not installed!
// if ghdl is not installed its also ok
} catch (Exception e) {
System.out.println(ExceptionWithOrigin.getOriginOf(e));
throw e;

4
src/test/java/de/neemann/digital/integration/FileScanner.java
View File

@ -22,8 +22,8 @@ public class FileScanner {
try {
count = scanIntern(path);
} catch (SkipAllException e) {
System.out.println("all tests are skipped: " + e.getMessage());
return -1;
System.err.println("all tests are skipped: " + e.getMessage());
throw e;
}
System.out.println("tested " + count + " examples");
if (errors.isEmpty())