Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes builds and tests, adds srpm target to Makefile #45

Merged
merged 3 commits into from
Mar 16, 2015
Merged

Fixes builds and tests, adds srpm target to Makefile #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5f7f62
Remove function malloc_readlink
Mar 13, 2015
cde55c7
Makefile: Adds srpm target
Mar 13, 2015
00bc0ba
Update the test results
Mar 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ rpm: dist
$(PKG_DIR)/abrt-java-connector.spec > $(OUT_DIR)/abrt-java-connector.spec && \
rpmbuild $(RPM_DIRS) $(RPM_FLAGS) -ba $(OUT_DIR)/abrt-java-connector.spec

.PHONY: srpm
srpm: dist
sed -e 's/global commit .*$$/global commit '"$$(git log -1 --format=%H)"'/' \
-e 's/%{?dist}/.'"$$(git log -1 --format=%h)%{?dist}"'/' \
$(PKG_DIR)/abrt-java-connector.spec > $(OUT_DIR)/abrt-java-connector.spec && \
rpmbuild $(RPM_DIRS) $(RPM_FLAGS) -bs $(OUT_DIR)/abrt-java-connector.spec

# Make sure the output dir is created
$(OUT_DIR):
mkdir -p $@ && cd $@ && cmake $$CMAKE_OPTS ../
Expand Down
23 changes: 0 additions & 23 deletions src/abrt-checker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,29 +1039,6 @@ static void get_thread_name(
}


/*
* Read executable name from link /proc/${PID}/exe
*/
static char* malloc_readlink(const char *linkname)
{
char buf[PATH_MAX + 1];
int len;

len = readlink(linkname, buf, sizeof(buf)-1);
if (len >= 0)
{
buf[len] = '\0';
char *p = malloc(strlen(buf) + 1);
if (p)
{
strcpy(p, buf);
}
return p;
}
return NULL;
}



/*
* Read executable name from the special file /proc/${PID}/exe
Expand Down
15 changes: 9 additions & 6 deletions test/outputs/Linux-aarch64/run_test.log.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.open()
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.open0()
Exception in thread "main" java.io.FileNotFoundException: _wrong_file_ (No such file or directory)
at java.io.FileInputStream.open(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.open0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.open(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.<init>(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at Test.readWrongFile(Test.java:89) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.fileRelatedIssues(Test.java:461) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:513) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.open()
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.open0()
Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
at java.io.FileInputStream.open(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.open0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.open(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.<init>(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at Test.readUnreadableFile(Test.java:111) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.fileRelatedIssues(Test.java:462) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:513) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.open()
Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.open0()
Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
at java.io.FileOutputStream.open(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at java.io.FileOutputStream.open0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at java.io.FileOutputStream.open(FileOutputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at java.io.FileOutputStream.<init>(FileOutputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at java.io.FileOutputStream.<init>(FileOutputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at Test.writeToUnwritableFile(Test.java:134) [file:@CMAKE_BINARY_DIR@/test/Test.class]
Expand Down
15 changes: 9 additions & 6 deletions test/outputs/Linux-ppc64/run_test.log.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.open()
Exception in thread "main" java.io.FileNotFoundException: _wrong_file_ (No such file or directory)
at java.io.FileInputStream.open(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.open0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.open(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.<init>(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at Test.readWrongFile(Test.java:89) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.fileRelatedIssues(Test.java:461) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:513) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.open()
Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
at java.io.FileInputStream.open(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.open0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.open(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.<init>(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at Test.readUnreadableFile(Test.java:111) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.fileRelatedIssues(Test.java:462) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:513) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.<init>()
Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.open()
Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
at java.io.FileOutputStream.open(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at java.io.FileOutputStream.open0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at java.io.FileOutputStream.open(FileOutputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at java.io.FileOutputStream.<init>(FileOutputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at java.io.FileOutputStream.<init>(FileOutputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at Test.writeToUnwritableFile(Test.java:134) [file:@CMAKE_BINARY_DIR@/test/Test.class]
Expand Down
15 changes: 9 additions & 6 deletions test/outputs/Linux-ppc64le/run_test.log.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,25 @@
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.open()
Exception in thread "main" java.io.FileNotFoundException: _wrong_file_ (No such file or directory)
at java.io.FileInputStream.open(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.open0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.open(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.<init>(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at Test.readWrongFile(Test.java:89) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.fileRelatedIssues(Test.java:461) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:513) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.<init>()
Caught exception java.io.FileNotFoundException in method java.io.FileInputStream.open()
Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
at java.io.FileInputStream.open(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.open0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.open(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at java.io.FileInputStream.<init>(FileInputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileInputStream.class]
at Test.readUnreadableFile(Test.java:111) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.fileRelatedIssues(Test.java:462) [file:@CMAKE_BINARY_DIR@/test/Test.class]
at Test.main(Test.java:513) [file:@CMAKE_BINARY_DIR@/test/Test.class]
executable: @CMAKE_BINARY_DIR@/test/Test.class
Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.<init>()
Caught exception java.io.FileNotFoundException in method java.io.FileOutputStream.open()
Exception in thread "main" java.io.FileNotFoundException: /root/.bashrc (Permission denied)
at java.io.FileOutputStream.open(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at java.io.FileOutputStream.open0(Native Method) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at java.io.FileOutputStream.open(FileOutputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at java.io.FileOutputStream.<init>(FileOutputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at java.io.FileOutputStream.<init>(FileOutputStream.java:LINENO) [jar:file:JAVA_AND_SYSTEM_SPECIFIC_PATH/rt.jar!/java/io/FileOutputStream.class]
at Test.writeToUnwritableFile(Test.java:134) [file:@CMAKE_BINARY_DIR@/test/Test.class]
Expand Down