diff options
Diffstat (limited to 'tests/charset')
| -rw-r--r-- | tests/charset/Makefile | 2 | ||||
| -rw-r--r-- | tests/charset/main.cpp | 6 | ||||
| -rwxr-xr-x | tests/charset/run-test.sh | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/charset/Makefile b/tests/charset/Makefile index 7c0fe6c0..e46fafa5 100644 --- a/tests/charset/Makefile +++ b/tests/charset/Makefile @@ -1,5 +1,5 @@ main: main.cpp ../../libvmime-debug.a - g++ -g -o main main.cpp ../../libvmime-debug.a + g++ -g -o main main.cpp -I../.. ../../libvmime-debug.a -lgnutls -lgsasl diff --git a/tests/charset/main.cpp b/tests/charset/main.cpp index 0fb2495a..9ad30432 100644 --- a/tests/charset/main.cpp +++ b/tests/charset/main.cpp @@ -24,14 +24,14 @@ #include <iostream> #include <ostream> -#include "../../src/vmime" -#include "../../examples/common.inc" +#include "vmime/vmime.hpp" +#include "vmime/platforms/posix/posixHandler.hpp" int main(int argc, char* argv[]) { // VMime initialization - vmime::platformDependant::setHandler<my_handler>(); + vmime::platformDependant::setHandler<vmime::platforms::posix::posixHandler>(); const vmime::string from(argv[1]); diff --git a/tests/charset/run-test.sh b/tests/charset/run-test.sh index d7ad5295..95846c06 100755 --- a/tests/charset/run-test.sh +++ b/tests/charset/run-test.sh @@ -5,7 +5,7 @@ TEMP_DIR="/tmp" PROGRAM="./main" -testFiles=`cd $TEST_DIR ; find . -regex '\./[^\.]*\.in\..*' -maxdepth 1 -type f` +testFiles=`cd $TEST_DIR ; find . -maxdepth 1 -regex '\./[^\.]*\.in\..*' -type f` echo echo Testing charset conversions @@ -16,7 +16,7 @@ for testFile in $testFiles ; do testName=`echo $testFile | sed 's/^\.\/\([^\.]*\).*/\1/'` sourceCharset=`echo $testFile | sed 's/^\.\/[^\.]*\.[^\.]*\.\(.*\)/\1/'` - testOutFiles=`cd $TEST_DIR ; find . -regex "\./$testName\.out\..*" -maxdepth 1 -type f` + testOutFiles=`cd $TEST_DIR ; find . -maxdepth 1 -regex "\./$testName\.out\..*" -type f` for testOutFile in $testOutFiles ; do |