Merge pull request #606 from larssilven/develop

rijswijk · web-flow · commit 35938595f839 · 2021-02-10T09:55:44.000+01:00
InfoTests::testGetMechanismNegativeListConfig() not working when testing
diff --git a/src/lib/test/InfoTests.cpp b/src/lib/test/InfoTests.cpp
@@ -365,7 +365,6 @@ void InfoTests::testGetMechanismListConfig()
 	setenv("SOFTHSM2_CONF", ".\\softhsm2.conf", 1);
 #endif
 }
-#endif // P11_SHARED_LIBRARY
 
 void InfoTests::testGetMechanismNegativeListConfig()
 {
@@ -432,6 +431,7 @@ void InfoTests::testGetMechanismNegativeListConfig()
 	setenv("SOFTHSM2_CONF", ".\\softhsm2.conf", 1);
 #endif
 }
+#endif // P11_SHARED_LIBRARY
 
 void InfoTests::testWaitForSlotEvent()
 {

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,6 @@ void InfoTests::testGetMechanismListConfig()`
`365`	`365`	`setenv("SOFTHSM2_CONF", ".\\softhsm2.conf", 1);`
`366`	`366`	`#endif`
`367`	`367`	`}`
`368`		`-#endif // P11_SHARED_LIBRARY`
`369`	`368`
`370`	`369`	`void InfoTests::testGetMechanismNegativeListConfig()`
`371`	`370`	`{`
`@@ -432,6 +431,7 @@ void InfoTests::testGetMechanismNegativeListConfig()`
`432`	`431`	`setenv("SOFTHSM2_CONF", ".\\softhsm2.conf", 1);`
`433`	`432`	`#endif`
`434`	`433`	`}`
	`434`	`+#endif // P11_SHARED_LIBRARY`
`435`	`435`
`436`	`436`	`void InfoTests::testWaitForSlotEvent()`
`437`	`437`	`{`