projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: include ctf-scanner-symbols.h to prefix yy_* symbols
[babeltrace.git]
/
tests
/
lib
/
test_ctf_writer.c
diff --git
a/tests/lib/test_ctf_writer.c
b/tests/lib/test_ctf_writer.c
index eb4b1b4def548be74949a7124f210425a6cacf45..ee979f0b1b3f5a88c783752f478d936b43a42f63 100644
(file)
--- a/
tests/lib/test_ctf_writer.c
+++ b/
tests/lib/test_ctf_writer.c
@@
-19,7
+19,6
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
#include <babeltrace/ctf-writer/writer.h>
#include <babeltrace/ctf-writer/clock.h>
#include <babeltrace/ctf-writer/stream.h>
#include <babeltrace/ctf-writer/writer.h>
#include <babeltrace/ctf-writer/clock.h>
#include <babeltrace/ctf-writer/stream.h>
@@
-32,6
+31,7
@@
#include <stdio.h>
#include <sys/utsname.h>
#include <babeltrace/compat/limits.h>
#include <stdio.h>
#include <sys/utsname.h>
#include <babeltrace/compat/limits.h>
+#include <babeltrace/compat/stdio.h>
#include <string.h>
#include <assert.h>
#include <unistd.h>
#include <string.h>
#include <assert.h>
#include <unistd.h>
@@
-39,6
+39,7
@@
#include <fcntl.h>
#include <babeltrace/compat/dirent.h>
#include "tap/tap.h"
#include <fcntl.h>
#include <babeltrace/compat/dirent.h>
#include "tap/tap.h"
+#include <sys/stat.h>
#define METADATA_LINE_SIZE 512
#define SEQUENCE_TEST_LENGTH 10
#define METADATA_LINE_SIZE 512
#define SEQUENCE_TEST_LENGTH 10
@@
-93,7
+94,7
@@
void validate_metadata(char *parser_path, char *metadata_path)
goto result;
}
goto result;
}
- execl(parser_path, "ctf-parser-test", NULL);
+ execl(parser_path, "ctf-parser-test",
(char *)
NULL);
perror("# Could not launch the ctf metadata parser process");
exit(-1);
}
perror("# Could not launch the ctf metadata parser process");
exit(-1);
}
@@
-127,12
+128,12
@@
result:
rewind(metadata_fp);
/* Output the metadata and parser output as diagnostic */
rewind(metadata_fp);
/* Output the metadata and parser output as diagnostic */
- while (getline(&line, &len, metadata_fp) > 0) {
+ while (
bt_
getline(&line, &len, metadata_fp) > 0) {
diag("%s", line);
}
rewind(parser_output_fp);
diag("%s", line);
}
rewind(parser_output_fp);
- while (getline(&line, &len, parser_output_fp) > 0) {
+ while (
bt_
getline(&line, &len, parser_output_fp) > 0) {
diag("%s", line);
}
diag("%s", line);
}
@@
-200,7
+201,7
@@
void validate_trace(char *parser_path, char *trace_path)
goto result;
}
goto result;
}
- execl(parser_path, "babeltrace", trace_path, NULL);
+ execl(parser_path, "babeltrace", trace_path,
(char *)
NULL);
perror("# Could not launch the babeltrace process");
exit(-1);
}
perror("# Could not launch the babeltrace process");
exit(-1);
}
@@
-224,7
+225,7
@@
result:
diag("malloc error");
}
rewind(babeltrace_output_fp);
diag("malloc error");
}
rewind(babeltrace_output_fp);
- while (getline(&line, &len, babeltrace_output_fp) > 0) {
+ while (
bt_
getline(&line, &len, babeltrace_output_fp) > 0) {
diag("%s", line);
}
diag("%s", line);
}
@@
-846,7
+847,19
@@
int main(int argc, char **argv)
struct dirent *entry;
while ((entry = readdir(trace_dir))) {
struct dirent *entry;
while ((entry = readdir(trace_dir))) {
- if (entry->d_type == DT_REG) {
+ struct stat st;
+ char filename[PATH_MAX];
+
+ if (snprintf(filename, sizeof(filename), "%s/%s",
+ trace_path, entry->d_name) <= 0) {
+ continue;
+ }
+
+ if (stat(entry->d_name, &st)) {
+ continue;
+ }
+
+ if (S_ISREG(st.st_mode)) {
unlinkat(bt_dirfd(trace_dir), entry->d_name, 0);
}
}
unlinkat(bt_dirfd(trace_dir), entry->d_name, 0);
}
}
This page took
0.023974 seconds
and
4
git commands to generate.