From 5ab6355c8a50c0fb1952479e14b97a077155a4f0 Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Wed, 29 Mar 2006 20:20:49 +0000
Subject: [PATCH] instrum size

git-svn-id: http://ltt.polymtl.ca/svn@1736 04897980-b3bd-0310-b5e0-8ef037075253
---
 tests/facilities/tests.xml                    | 23 +++++++++++++++++++
 tests/kernel/test-instrument-size-big.mod.c   | 16 -------------
 tests/kernel/test-instrument-size-med.mod.c   | 16 -------------
 tests/kernel/test-instrument-size-small.mod.c | 16 -------------
 tests/user/Makefile                           |  5 +++-
 tests/user/test-usertrace-time.c              |  2 +-
 6 files changed, 28 insertions(+), 50 deletions(-)
 delete mode 100644 tests/kernel/test-instrument-size-big.mod.c
 delete mode 100644 tests/kernel/test-instrument-size-med.mod.c
 delete mode 100644 tests/kernel/test-instrument-size-small.mod.c

diff --git a/tests/facilities/tests.xml b/tests/facilities/tests.xml
index 68808aff..a70eabd7 100644
--- a/tests/facilities/tests.xml
+++ b/tests/facilities/tests.xml
@@ -6,5 +6,28 @@
     <description>Write a 4 bytes int</description>
 		<field name="data"><int size="4"></field>
   </event>
+	
+  <event name="write_string">
+    <description>Write a string</description>
+		<field name="data"><string></field>
+  </event>
+
+  <event name="write_struct">
+    <description>Write a structure (big)</description>
+		<field name="data1"><int size="4"></field>
+		<field name="data2">
+			<struct>
+				<field name="data3"><string></field>
+				<field name="data4"><int size="4"></field>
+				<field name="data5">
+					<sequence>
+					<uint>
+					<int_fixed size="8">
+					</sequence>
+				</field>
+				<field name="data6"><int size="8"></field>
+			</struct>
+		</field>
+  </event>
 
 </facility>
diff --git a/tests/kernel/test-instrument-size-big.mod.c b/tests/kernel/test-instrument-size-big.mod.c
deleted file mode 100644
index 9159fdfc..00000000
--- a/tests/kernel/test-instrument-size-big.mod.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <linux/module.h>
-#include <linux/vermagic.h>
-#include <linux/compiler.h>
-
-MODULE_INFO(vermagic, VERMAGIC_STRING);
-
-struct module __this_module
-__attribute__((section(".gnu.linkonce.this_module"))) = {
- .name = KBUILD_MODNAME,
-};
-
-static const char __module_depends[]
-__attribute_used__
-__attribute__((section(".modinfo"))) =
-"depends=ltt-facility-loader-tests";
-
diff --git a/tests/kernel/test-instrument-size-med.mod.c b/tests/kernel/test-instrument-size-med.mod.c
deleted file mode 100644
index 9159fdfc..00000000
--- a/tests/kernel/test-instrument-size-med.mod.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <linux/module.h>
-#include <linux/vermagic.h>
-#include <linux/compiler.h>
-
-MODULE_INFO(vermagic, VERMAGIC_STRING);
-
-struct module __this_module
-__attribute__((section(".gnu.linkonce.this_module"))) = {
- .name = KBUILD_MODNAME,
-};
-
-static const char __module_depends[]
-__attribute_used__
-__attribute__((section(".modinfo"))) =
-"depends=ltt-facility-loader-tests";
-
diff --git a/tests/kernel/test-instrument-size-small.mod.c b/tests/kernel/test-instrument-size-small.mod.c
deleted file mode 100644
index 9159fdfc..00000000
--- a/tests/kernel/test-instrument-size-small.mod.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include <linux/module.h>
-#include <linux/vermagic.h>
-#include <linux/compiler.h>
-
-MODULE_INFO(vermagic, VERMAGIC_STRING);
-
-struct module __this_module
-__attribute__((section(".gnu.linkonce.this_module"))) = {
- .name = KBUILD_MODNAME,
-};
-
-static const char __module_depends[]
-__attribute_used__
-__attribute__((section(".modinfo"))) =
-"depends=ltt-facility-loader-tests";
-
diff --git a/tests/user/Makefile b/tests/user/Makefile
index 6c773f7b..bcd3dad0 100644
--- a/tests/user/Makefile
+++ b/tests/user/Makefile
@@ -14,11 +14,14 @@ all: tests
 
 #TEST PROGRAMS
 
-tests: test-usertrace-time
+tests: test-usertrace-time test-usertrace-time-slow
 
 test-usertrace-time: test-usertrace-time.c ltt-facility-loader-user_tests.c
 	$(CC) $(CFLAGS) -lltt-usertrace-fast -o $@ $^
 
+test-usertrace-time-slow: test-usertrace-time-slow.c ltt-facility-loader-user_tests.c
+	$(CC) $(CFLAGS) -o $@ $^
+
 #LIBRAIRIES
 
 .PHONY : clean tests
diff --git a/tests/user/test-usertrace-time.c b/tests/user/test-usertrace-time.c
index f279ee42..7d007e1e 100644
--- a/tests/user/test-usertrace-time.c
+++ b/tests/user/test-usertrace-time.c
@@ -1,7 +1,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
-#include <sys/timex.h>
+#include <asm/timex.h>
 
 #define LTT_TRACE
 #define LTT_TRACE_FAST
-- 
2.34.1