Making sure failure returns 1 and success 0, adding an initial attempt at AppVeyor CI for Windows.
This commit is contained in:
parent
004b1972d2
commit
242ce8d130
8 changed files with 40 additions and 8 deletions
|
@ -64,4 +64,5 @@ script:
|
||||||
- cd build
|
- cd build
|
||||||
- cmake -D CMAKE_BUILD_TYPE=RELEASE ..
|
- cmake -D CMAKE_BUILD_TYPE=RELEASE ..
|
||||||
- make -j2
|
- make -j2
|
||||||
- ./bin/FaceLandmarkImg -fdir "../videos/" -ofdir "./demo_img/" -oidir "./demo_img/" -wild -q
|
- cd ../tests
|
||||||
|
- ./tests.sh
|
15
appveyor.yml
Normal file
15
appveyor.yml
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
version: 1.0.{build}
|
||||||
|
branches:
|
||||||
|
only:
|
||||||
|
- develop
|
||||||
|
- master
|
||||||
|
- feature-travis
|
||||||
|
configuration:
|
||||||
|
- Debug
|
||||||
|
- Release
|
||||||
|
platform:
|
||||||
|
- x64
|
||||||
|
- x86
|
||||||
|
build:
|
||||||
|
project: OpenFace.sln
|
||||||
|
verbosity: minimal
|
|
@ -367,7 +367,7 @@ int main (int argc, char **argv)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cout << "Can't find AU prediction files, exiting" << endl;
|
cout << "Can't find AU prediction files, exiting" << endl;
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -386,7 +386,7 @@ int main (int argc, char **argv)
|
||||||
if (!exists(loc))
|
if (!exists(loc))
|
||||||
{
|
{
|
||||||
cout << "Can't find triangulation files, exiting" << endl;
|
cout << "Can't find triangulation files, exiting" << endl;
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -247,6 +247,7 @@ int main (int argc, char **argv)
|
||||||
if (!boost::filesystem::exists(current_file))
|
if (!boost::filesystem::exists(current_file))
|
||||||
{
|
{
|
||||||
FATAL_STREAM("File does not exist");
|
FATAL_STREAM("File does not exist");
|
||||||
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
current_file = boost::filesystem::path(current_file).generic_string();
|
current_file = boost::filesystem::path(current_file).generic_string();
|
||||||
|
@ -264,7 +265,11 @@ int main (int argc, char **argv)
|
||||||
video_capture >> captured_image;
|
video_capture >> captured_image;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !video_capture.isOpened() ) FATAL_STREAM( "Failed to open video source" );
|
if (!video_capture.isOpened())
|
||||||
|
{
|
||||||
|
FATAL_STREAM("Failed to open video source");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
else INFO_STREAM( "Device or file opened");
|
else INFO_STREAM( "Device or file opened");
|
||||||
|
|
||||||
cv::Mat captured_image;
|
cv::Mat captured_image;
|
||||||
|
|
|
@ -219,7 +219,11 @@ int main (int argc, char **argv)
|
||||||
video_capture >> captured_image;
|
video_capture >> captured_image;
|
||||||
}
|
}
|
||||||
|
|
||||||
if( !video_capture.isOpened() ) FATAL_STREAM( "Failed to open video source" );
|
if (!video_capture.isOpened())
|
||||||
|
{
|
||||||
|
FATAL_STREAM("Failed to open video source");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
else INFO_STREAM( "Device or file opened");
|
else INFO_STREAM( "Device or file opened");
|
||||||
|
|
||||||
cv::Mat captured_image;
|
cv::Mat captured_image;
|
||||||
|
|
|
@ -337,7 +337,7 @@ int main (int argc, char **argv)
|
||||||
if(!exists(loc))
|
if(!exists(loc))
|
||||||
{
|
{
|
||||||
cout << "Can't find triangulation files, exiting" << endl;
|
cout << "Can't find triangulation files, exiting" << endl;
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -378,7 +378,7 @@ int main (int argc, char **argv)
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
cout << "Can't find AU prediction files, exiting" << endl;
|
cout << "Can't find AU prediction files, exiting" << endl;
|
||||||
return 0;
|
return 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -168,7 +168,10 @@ int main (int argc, char **argv)
|
||||||
INFO_STREAM( "Attempting to capture from device: " << device );
|
INFO_STREAM( "Attempting to capture from device: " << device );
|
||||||
vCap = cv::VideoCapture( device );
|
vCap = cv::VideoCapture( device );
|
||||||
|
|
||||||
if( !vCap.isOpened() ) FATAL_STREAM( "Failed to open video source" );
|
if (!vCap.isOpened()) {
|
||||||
|
FATAL_STREAM("Failed to open video source");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
cv::Mat img;
|
cv::Mat img;
|
||||||
vCap >> img;
|
vCap >> img;
|
||||||
|
|
4
tests/tests.sh
Normal file
4
tests/tests.sh
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
../build/bin/FaceLandmarkImg -fdir "../videos/" -ofdir "./demo_img/" -oidir "./demo_img/" -wild -q
|
||||||
|
../build/bin/FaceLandmarkVidMulti -f ../videos/multi_face.avi
|
||||||
|
../build/bin/FeatureExtraction -rigid -verbose -f "../videos/default.wmv" -of "output_features/default.txt" -simalign output_features/aligned
|
||||||
|
../build/bin/FaceLandmarkVid -f "../videos/changeLighting.wmv" -f "../videos/0188_03_021_al_pacino.avi" -f "../videos/0217_03_006_alanis_morissette.avi" -f "../videos/0244_03_004_anderson_cooper.avi"
|
Loading…
Reference in a new issue