[CORRECTIVE] Fix Abs Def and Bus Def test compilation

kactus2 · Nov 30, 2023 · e2fbe15 · e2fbe15
1 parent 17fb5ae
commit e2fbe15
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 15 deletions.
diff --git a/Kactus2_Solution.pro b/Kactus2_Solution.pro
@@ -106,6 +106,6 @@ SVDGenerator.depends = IPXACTmodels KactusAPI
 RenodeGenerator.file = Plugins/RenodeGenerator/RenodeGeneratorPlugin.pro
 RenodeGenerator.depends = IPXACTmodels KactusAPI
 
-test_all.subdir = tests
-test_all.depends = IPXACTmodels
+test_all.file = tests/test_all.pro
+test_all.depends = IPXACTmodels KactusAPI
 
diff --git a/tests/IPXACTmodels/AbstractionDefinition/tst_AbstractionDefinitionValidator.pro b/tests/IPXACTmodels/AbstractionDefinition/tst_AbstractionDefinitionValidator.pro
@@ -19,14 +19,12 @@ CONFIG += c++11 testcase console
 
 linux-g++ | linux-g++-64 | linux-g++-32 {
  LIBS += -L../../../executable \
-     -lIPXACTmodels
+     -lIPXACTmodels -lKactusAPI
 
 }
 win64 | win32 {
  LIBS += -L$$PWD/../../../executable/ \
-     -lIPXACTmodelsd
- LIBS += -L$$PWD/../../../executable/ \
-     -lKactusAPId
+     -lIPXACTmodelsd -lKactusAPId
 }
 
 DESTDIR = ./release

diff --git a/tests/IPXACTmodels/AbstractionDefinition/tst_AbstractionDefinitionWriter.pro b/tests/IPXACTmodels/AbstractionDefinition/tst_AbstractionDefinitionWriter.pro
@@ -21,7 +21,6 @@ CONFIG += c++11 testcase console
 linux-g++ | linux-g++-64 | linux-g++-32 {
  LIBS += -L../../../executable \
      -lIPXACTmodels
-
 }
 win64 | win32 {
  LIBS += -L../../../executable/ \

diff --git a/tests/IPXACTmodels/BusDefinition/tst_BusDefinitionValidator.pri b/tests/IPXACTmodels/BusDefinition/tst_BusDefinitionValidator.pri
@@ -2,6 +2,4 @@
 # This file is generated by the Qt Visual Studio Tools.
 # ------------------------------------------------------
 
-HEADERS += ../../../KactusAPI/include/SystemVerilogExpressionParser.h
-SOURCES += ../../../KactusAPI/expressions/SystemVerilogExpressionParser.cpp \
-    ./tst_BusDefinitionValidator.cpp
+SOURCES += ./tst_BusDefinitionValidator.cpp
diff --git a/tests/IPXACTmodels/BusDefinition/tst_BusDefinitionValidator.pro b/tests/IPXACTmodels/BusDefinition/tst_BusDefinitionValidator.pro
@@ -19,15 +19,13 @@ CONFIG += c++11 testcase console
 
 linux-g++ | linux-g++-64 | linux-g++-32 {
  LIBS += -L../../../executable \
-     -lIPXACTmodelsd
- LIBS += -L../../../executable \
-     -lKactusAPId
+     -lIPXACTmodels \
+     -lKactusAPI
 
 }
 win64 | win32 {
  LIBS += -L../../../executable/ \
-     -lIPXACTmodelsd
- LIBS += -L../../../executable/ \
+     -lIPXACTmodelsd \
      -lKactusAPId
 }