X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=tests%2Fsession.c;h=72d9342955c61a368b6c9611c3a561f96a468735;hb=refs%2Ftags%2Flibsigrok-0.5.1;hp=699f58360c4f7bafd5e1151004bae88bf9c57d44;hpb=02a2bf688f25a50ea05276be75fba8b4f644fca6;p=libsigrok.git
diff --git a/tests/session.c b/tests/session.c
index 699f5836..72d93429 100644
--- a/tests/session.c
+++ b/tests/session.c
@@ -14,13 +14,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
+#include
#include
#include
-#include "../include/libsigrok/libsigrok.h"
+#include
#include "lib.h"
/*
@@ -32,7 +32,7 @@ START_TEST(test_session_new)
int ret;
struct sr_session *sess;
- ret = sr_session_new(&sess);
+ ret = sr_session_new(srtest_ctx, &sess);
fail_unless(ret == SR_OK, "sr_session_new() failed: %d.", ret);
sr_session_destroy(sess);
}
@@ -46,7 +46,7 @@ START_TEST(test_session_new_bogus)
{
int ret;
- ret = sr_session_new(NULL);
+ ret = sr_session_new(srtest_ctx, NULL);
fail_unless(ret != SR_OK, "sr_session_new(NULL) worked.");
}
END_TEST
@@ -63,11 +63,11 @@ START_TEST(test_session_new_multiple)
sess1 = sess2 = sess3 = NULL;
/* Multiple sr_session_new() calls must work. */
- ret = sr_session_new(&sess1);
+ ret = sr_session_new(srtest_ctx, &sess1);
fail_unless(ret == SR_OK, "sr_session_new() 1 failed: %d.", ret);
- ret = sr_session_new(&sess2);
+ ret = sr_session_new(srtest_ctx, &sess2);
fail_unless(ret == SR_OK, "sr_session_new() 2 failed: %d.", ret);
- ret = sr_session_new(&sess3);
+ ret = sr_session_new(srtest_ctx, &sess3);
fail_unless(ret == SR_OK, "sr_session_new() 3 failed: %d.", ret);
/* The returned session pointers must all be non-NULL. */
@@ -99,7 +99,7 @@ START_TEST(test_session_destroy)
int ret;
struct sr_session *sess;
- sr_session_new(&sess);
+ sr_session_new(srtest_ctx, &sess);
ret = sr_session_destroy(sess);
fail_unless(ret == SR_OK, "sr_session_destroy() failed: %d.", ret);
}
@@ -124,7 +124,7 @@ START_TEST(test_session_trigger_set_get)
struct sr_session *sess;
struct sr_trigger *t1, *t2;
- sr_session_new(&sess);
+ sr_session_new(srtest_ctx, &sess);
t1 = sr_trigger_new("T1");
/* Set a trigger and see if getting it works OK. */
@@ -146,7 +146,7 @@ START_TEST(test_session_trigger_set_get_null)
struct sr_session *sess;
struct sr_trigger *t;
- sr_session_new(&sess);
+ sr_session_new(srtest_ctx, &sess);
/* Adding a NULL trigger is allowed. */
ret = sr_session_trigger_set(sess, NULL);