Fixed 'make distclean'
This commit is contained in:
parent
116f983b85
commit
a3ce2b9778
5 changed files with 23 additions and 10 deletions
|
@ -1,6 +1,7 @@
|
||||||
ACLOCAL_AMFLAGS = -I acinclude -I build-scripts
|
ACLOCAL_AMFLAGS = -I acinclude -I build-scripts
|
||||||
|
|
||||||
SUBDIRS = src/libtest src/runner \
|
SUBDIRS = src/libtest \
|
||||||
|
src/runner \
|
||||||
tests/testdummy \
|
tests/testdummy \
|
||||||
tests/testrect \
|
tests/testrect \
|
||||||
tests/testplatform \
|
tests/testplatform \
|
||||||
|
@ -16,6 +17,6 @@ install-runner:
|
||||||
install-tests:
|
install-tests:
|
||||||
$(SHELL) build-scripts/install-tests.sh
|
$(SHELL) build-scripts/install-tests.sh
|
||||||
|
|
||||||
clean:
|
distclean-local:
|
||||||
clean-local:
|
$(SHELL) build-scripts/distclean.sh
|
||||||
echo "clean-local is obsolete"
|
|
||||||
|
|
17
test/test-automation/build-scripts/distclean.sh
Executable file
17
test/test-automation/build-scripts/distclean.sh
Executable file
|
@ -0,0 +1,17 @@
|
||||||
|
#! /bin/bash
|
||||||
|
|
||||||
|
DIRECTORY="tests"
|
||||||
|
EXT="error"
|
||||||
|
|
||||||
|
PLATFORM="$(uname)"
|
||||||
|
if [[ $PLATFORM == "Linux" ]]; then
|
||||||
|
EXT="so"
|
||||||
|
elif [[ $PLATFORM == "Darwin" ]]; then
|
||||||
|
EXT="dylib"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Debug: $DIRECTORY/*.$EXT"
|
||||||
|
|
||||||
|
rm -f $DIRECTORY/*.$EXT
|
||||||
|
rm -f runner
|
||||||
|
rm -f *.bmp
|
|
@ -1,7 +1,5 @@
|
||||||
#! /bin/bash
|
#! /bin/bash
|
||||||
|
|
||||||
#echo "Installing test suites to $DIRECTORY"
|
|
||||||
|
|
||||||
cp src/runner/.libs/runner .
|
cp src/runner/.libs/runner .
|
||||||
chmod u+x runner
|
chmod u+x runner
|
||||||
|
|
||||||
|
|
|
@ -5,7 +5,6 @@ EXT="error"
|
||||||
|
|
||||||
#echo "Installing test suites to $DIRECTORY"
|
#echo "Installing test suites to $DIRECTORY"
|
||||||
|
|
||||||
#rm -Rfv $DIRECTORY/ > /dev/null 2>&1
|
|
||||||
mkdir $DIRECTORY > /dev/null 2>&1
|
mkdir $DIRECTORY > /dev/null 2>&1
|
||||||
|
|
||||||
PLATFORM="$(uname)"
|
PLATFORM="$(uname)"
|
||||||
|
@ -21,6 +20,4 @@ do
|
||||||
cp -f "$DIRECTORY/$suite/.libs/lib$suite.$EXT" $DIRECTORY
|
cp -f "$DIRECTORY/$suite/.libs/lib$suite.$EXT" $DIRECTORY
|
||||||
done
|
done
|
||||||
|
|
||||||
#sudo cp .libs/libtest.0.dylib /usr/local/lib/libtest.0.dylib
|
|
||||||
|
|
||||||
echo "Test suites installed."
|
echo "Test suites installed."
|
||||||
|
|
|
@ -233,7 +233,7 @@ ScanForTestSuites(char *directoryName, char *extension)
|
||||||
}
|
}
|
||||||
|
|
||||||
while(entry = readdir(directory)) {
|
while(entry = readdir(directory)) {
|
||||||
// discards . and .. and hidden files starting with .
|
// discards . and .. and hidden files starting with dot and directories etc.
|
||||||
if(strlen(entry->d_name) > 2 && entry->d_name[0] != '.' && entry->d_type == DT_REG) {
|
if(strlen(entry->d_name) > 2 && entry->d_name[0] != '.' && entry->d_type == DT_REG) {
|
||||||
const char *delimiters = ".";
|
const char *delimiters = ".";
|
||||||
char *name = strtok(entry->d_name, delimiters);
|
char *name = strtok(entry->d_name, delimiters);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue