directories = NULL;
/* the include directories : see the !i metacommand */
-/*vector_t
-include_dirs = NULL;*/
xbt_dynar_t
include_dirs = NULL;
static fstreams_t
fstreams = NULL;
-/* xbt logs */
-static xbt_dynar_t
-logs = NULL;
-
/* the list of tesh file suffixes */
static xbt_dynar_t
suffixes = NULL;
-
static excludes_t
excludes = NULL;
static int
print_version_flag = 0;
-/* if 1, the syntax of all tesh files is checked
- * before running them
- */
-static int
-check_syntax_flag = 0;
-
/* if 1, the status of all the units is display at
* the end.
*/
int
just_print_flag = 0;
-static int
-env_overrides_flag = 0;
-
-static int
-print_database_flag = 0;
-
-static int
-question_flag = 0;
-
/* the semaphore used to synchronize the jobs */
xbt_os_sem_t
jobs_sem = NULL;
int
exit_code = 0;
+int
+err_kind = 0;
+
+char*
+err_line = NULL;
+
+
pid_t
pid =0;
int
is_tesh_root = 1;
-xbt_dynar_t
-errors = NULL;
-
-xbt_os_mutex_t
-err_mutex = NULL;
-
/* the table of the entries of the options */
static const struct s_optentry opt_entries[] =
{
{ 'C', string, (byte*)NULL, 0, "directory" },
{ 'x', string, (byte*)&suffixes, 0, "suffix" },
- { 'e', flag, (byte*)&env_overrides_flag, 0, "environment-overrides", },
{ 'f', string, (byte*)&fstreams, 0, "file" },
{ 'h', flag, (byte*)&print_usage_flag, 0, "help" },
- { 'a', flag, (byte*)&print_readme_flag, 0, "semantic" },
- { 'i', flag, (byte*)&keep_going_unit_flag, 0, "keep-going-unit" },
+ { 'a', flag, (byte*)&print_readme_flag, 0, "README" },
+ { 'k', flag, (byte*)&keep_going_flag, 0, "keep-going" },
+ { 'i', flag, (byte*)&keep_going_unit_flag, 0, "keep-going-unit"},
{ 'I', string, (byte*)&include_dirs, 0, "include-dir" },
{ 'j', number, (byte*)&jobs_nb, (byte*) &optional_jobs_nb, "jobs" },
- { 'k', flag, (byte*)&keep_going_flag, 0, "keep-going" },
{ 'm', flag, (byte*)&detail_summary_flag, 0, "detail-summary" },
{ 'c', flag, (byte*)&just_print_flag, 0, "just-print" },
- { 'd', flag, (byte*)&print_database_flag, 0,"display-data-base" },
- { 'q', flag, (byte*)&question_flag, 0, "question_flag" },
{ 's', flag, (byte*)&silent_flag, 0, "silent" },
{ 'V', flag, (byte*)&print_version_flag, 0, "version" },
- { 'w', flag, (byte*)&print_directory_flag, 0,"dont-display-directory" },
+ { 'w', flag, (byte*)&print_directory_flag, 0,"dont-print-directory" },
{ 'n', flag, (byte*)&dry_run_flag, 0, "dry-run"},
{ 't', number, (byte*)&timeout, 0, "timeout" },
- { 'S', flag, (byte*)&check_syntax_flag, 0, "check-syntax"},
{ 'r', string, (byte*)&directories, 0, "load-directory"},
{ 'v', flag, (byte*)&summary_flag, 0, "summary"},
{ 'F', string,(byte*)&excludes, 0, "exclude"},
- { 'l', string,(byte*)&logs,0,"log"},
+ { 'l', string, (byte*)NULL, 0, "log" },
{ 0, 0, 0, 0, 0}
};
" - the write pipe is broken\n",
" - the command assigned delay is outdated\n",
" -I DIRECTORY, --include-dir=DIRECTORY Search DIRECTORY for included files.\n",
- " -j [N], --jobs[=N] Allow N commands at once; infinite commands with\n"
+ " -j [N], --jobs[=N] Allow N units at once; infinite units with\n"
" no arg.\n",
" -k, --keep-going Keep going when some commands can't be made or\n",
" failed.\n",
" -c, --just-print Don't actually run any commands; just print them.\n",
- " -p, --print-data-base Display tesh's internal database.\n",
- " -q, --question Run no commands; exit status says if up to date.\n",
" -s, --silent, Don't echo commands.\n",
" -V, --version Print the version number of tesh and exit.\n",
" -d, --dont-print-directory Don't display the current directory.\n",
" -n, --dry-run Check the syntax of the specified tesh files, display the result and exit.\n",
" -t, --timeout Wait the end of the commands at most timeout seconds.\n",
- " -S, --check-syntax Check the syntax of the tesh files before run them. \n",
" -x, --suffix Consider the new suffix for the tesh files.\n"
" remark :\n",
" the default suffix for the tesh files is \".tesh\".\n",
- " -a, --read-me Print the read me file and exit.\n",
- " -b, --build-file Build a tesh file.\n",
+ " -a, --README Print the read me file and exit.\n",
" -r, --load-directory Run all the tesh files located in the directories specified by the option --directory.\n",
" -v, --summary Display the status of the commands.\n",
" -m, --detail-summary Detail the summary of the run.\n",
static int
init(void);
+static int
+screen_cleaned;
-static void
-sig_abort_handler(int signum)
-{
- /* TODO : implement this function */
- INFO0("sig_abort_handler() called");
-}
+static int
+finalized = 0;
+
+static int
+sig_int = 0;
+#ifdef WIN32
static void
sig_int_handler(int signum)
{
- /* TODO : implement this function */
- INFO0("sig_int_handler() called");
+
+ if(!finalized)
+ {
+ sig_int = 1;
+ runner_interrupt();
+ while(!finalized);
+ }
+
}
+#endif
static void
free_string(void* str)
free(*(void**)str);
}
-static void
-free_error(void* e)
-{
- free(*(void**)e);
-}
-
int
main(int argc, char* argv[])
{
- int _argc;
-
/* set the locale to the default*/
setlocale(LC_ALL,"");
+
+ /* xbt initialization */
+ xbt_init(&argc, argv);
/* initialize tesh */
if(init() < 0)
/* move to the root directory (the directory may change during the command line processing) */
chdir(root_directory->name);
- /* initialize the xbt library
- * for thread portability layer
- */
-
- /* xbt initialization */
-
- if((_argc = xbt_dynar_length(logs)))
- {
- int i;
-
- char** _argv = (char**)calloc(_argc, sizeof(char*));
-
- for(i = 0; i < _argc; i++)
- xbt_dynar_pop(logs, &(_argv[i]));
-
- xbt_init(&_argc, _argv);
-
- while(--i)
- free(_argv[i]);
-
- free(_argv);
- }
- else
- xbt_init(&argc, argv);
-
/* the user wants to display the usage of tesh */
if(print_version_flag)
{
jobs_nb = fstreams_get_size(fstreams);
}
+ if(jobs_nb != 1 && dry_run_flag)
+ {
+ jobs_nb = 1;
+ INFO0("Dry run specified : force jobs count to 1");
+ }
+
/* initialize the semaphore used to synchronize all the units */
jobs_sem = xbt_os_sem_init(jobs_nb);
units_sem = xbt_os_sem_init(0);
/* initialize the runner */
- if(runner_init(check_syntax_flag, timeout, fstreams) < 0)
+ if(runner_init(/*check_syntax_flag,*/ timeout, fstreams) < 0)
finalize();
if(just_print_flag && silent_flag)
/* run all the units */
runner_run();
-
+ if(runner_is_timedout())
+ ERROR1("Tesh timed out after `(%d)' seconds", timeout);
+
/* show the result of the units */
- if(summary_flag || dry_run_flag)
+ if(detail_summary_flag ||summary_flag || dry_run_flag)
runner_summarize();
/* all the test are runned, destroy the runner */
* to the calling process : tesh)
*/
prev_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
+
+ /* handle the interrupt signal */
+ signal(SIGINT, sig_int_handler);
#else
- struct sigaction act;
/* Ignore pipe issues.
* They will show up when we try to send data to dead buddies,
* but we will stop doing so when we're done with provided input
*/
- memset(&act,0, sizeof(struct sigaction));
+ /*
+ struct sigaction act;
+ memset(&act,0, sizeof(struct sigaction));
act.sa_handler = SIG_IGN;
sigaction(SIGPIPE, &act, NULL);
-
- memset(&act,0, sizeof(struct sigaction));
- act.sa_handler = sig_abort_handler;
- sigaction(SIGABRT, &act, NULL);
-
memset(&act,0, sizeof(struct sigaction));
act.sa_handler = sig_int_handler;
- sigaction(SIGINT, &act, NULL);
+ sigaction(SIGINT, &act, NULL);*/
#endif
- err_mutex = xbt_os_mutex_init();
- /* handle the abort signal */
- /*signal(SIGABRT, sig_abort_handler);*/
- /* handle the interrupt signal */
- /*signal(SIGINT, sig_int_handler);*/
/* used to store the files to run */
- if(!(fstreams = fstreams_new(DEFAULT_FSTREAMS_CAPACITY, (void_f_pvoid_t)fstream_free)))
+ if(!(fstreams = fstreams_new((void_f_pvoid_t)fstream_free)))
{
ERROR1("(system error) %s", strerror(errno));
return -1;
free(buffer);
- /* this vector contains all the errors of the run */
- errors = xbt_dynar_new(sizeof(xerror_t), free_error);
-
/* the directories to loads */
if(!(directories = directories_new()))
{
/* the include directories */
include_dirs = xbt_dynar_new(sizeof(directory_t), (void_f_pvoid_t)directory_free);
- /* xbt logs option */
- if(!(logs = xbt_dynar_new(sizeof(char*), free_string)))
- {
- ERROR1("(system error) %s", strerror(errno));
- return -1;
- }
-
/* the excluded files */
if(!(excludes = excludes_new()))
{
static void
finalize(void)
{
-
- if(is_tesh_root && !summary_flag)
- {
- xerror_t error;
- unsigned int i;
-
- xbt_dynar_foreach(errors, i, error)
- {
- if(error->command)
- fprintf(stderr, "[tesh/ERROR] %s : <Command `%s'> <Unit `%s'> <C%d (%s)>\n", error->reason, error->command, error->unit, error->errcode, error_to_string(error->errcode));
- else if(!error->command && error->unit)
- fprintf(stderr, "[tesh/ERROR] %s : Unit `%s' - C%d (%s)\n", error->reason, error->unit, error->errcode, error_to_string(error->errcode));
- else if(!error->command && !error->unit && error->reason)
- fprintf(stderr, "[tesh/ERROR] %s : C%d (%s)\n", error->reason, error->errcode, error_to_string(error->errcode));
- else if(!error->command && !error->unit && !error->reason)
- fprintf(stderr, "[tesh/ERROR] C%d (%s)\n", error->errcode, error_to_string(error->errcode));
-
- }
- }
-
-
- /* delete vector of errors */
- if(errors)
- xbt_dynar_free(&errors);
-
- xbt_os_mutex_destroy(err_mutex);
-
/* delete the fstreams object */
if(fstreams)
fstreams_free((void**)&fstreams);
/* delete the list of tesh files suffixes */
if(suffixes)
xbt_dynar_free(&suffixes);
-
- /* delete the xbt log options list */
- if(logs)
- xbt_dynar_free(&logs);
-
/* destroy the semaphore used to synchronize the units */
if(jobs_sem)
if(units_sem)
xbt_os_sem_destroy(units_sem);
- /* exit from the xbt framework */
- xbt_exit();
-
/* Windows specific (restore the previouse error mode */
#ifdef WIN32
SetErrorMode(prev_error_mode);
#endif
-
- if(!summary_flag && !dry_run_flag && !silent_flag && !just_print_flag && !print_version_flag && !print_usage_flag && is_tesh_root)
+
+ if(sig_int)
+ INFO0("Tesh interrupted (receive a SIGINT)");
+ else if(!summary_flag && !detail_summary_flag && !dry_run_flag && !silent_flag && !just_print_flag && !print_version_flag && !print_usage_flag && is_tesh_root)
{
if(!exit_code)
- INFO2("tesh terminated with exit code %d : %s",exit_code, "success");
+ INFO2("Tesh terminated with exit code %d : %s",exit_code, "success");
else
- ERROR2("tesh terminated with exit code %d : %s",exit_code, error_to_string(exit_code));
+ {
+ if(err_line)
+ ERROR3("Tesh terminated with exit code `(<%s> %s)' (%d)",err_line, error_to_string(exit_code, err_kind), exit_code);
+ else
+ ERROR2("Tesh terminated with exit code `(%s)' (%d)", error_to_string(exit_code, err_kind), exit_code);
+
+ }
}
+
+ if(err_line)
+ free(err_line);
+ /* exit from the xbt framework */
+ xbt_exit();
+
+ finalized = 1;
/* exit with the last error code */
- exit(exit_code);
+ if(!sig_int)
+ exit(exit_code);
}
/* init_options -- initialize the options string */
if(getpath(optarg, &path) < 0)
{
exit_code = errno;
+ err_kind = 0;
if(ENOENT == errno)
ERROR1("File %s does not exist", optarg);
/* get to the last / (if any) to get the short name of the file */
delimiter = strrchr(optarg,'/');
+ #ifdef WIN32
+ if(!delimiter)
+ delimiter = strrchr(optarg,'\\');
+ #endif
+
/* create a new file stream which represents the tesh file to run */
fstream = fstream_new(path, delimiter ? delimiter + 1 : optarg);
}
else
fstreams_add(fstreams, fstream);
-
-
-
}
else if (c == '?')
/* unknown option, let getopt_long() displays the error */
ERROR0("Command line processing failed : invalid command line");
exit_code = EINVCMDLINE;
+ err_kind = 1;
return -1;
}
else
default:
ERROR0("Command line processing failed : internal error");
exit_code = EPROCCMDLINE;
+ err_kind = 1;
return -1;
/* a non optional argument is not specified */
ERROR2("Option %c \"%s\"requires an argument",entry->c,entry->long_name);
exit_code = ENOARG;
+ err_kind = 1;
return -1;
}
/* --load-directory option */
if(!strcmp(entry->long_name,"load-directory"))
{
- #ifdef WIN32
- struct stat info = {0};
- if(stat(optarg, &info) || !S_ISDIR(info.st_mode))
- {
- ERROR1("%s is not a directory",optarg);
- exit_code = ENOTDIR;
- return -1;
- }
-
- #else
char* path;
if(translatepath(optarg, &path) < 0)
{
exit_code = errno;
+ err_kind = 0;
if(ENOTDIR == errno)
ERROR1("%s is not a directory",optarg);
return -1;
}
- #endif
else
{
- #ifdef WIN32
- directory = directory_new(optarg);
- #else
+
directory = directory_new(path);
free(path);
- #endif
if(directories_contains(directories, directory))
{
}
else if(!strcmp(entry->long_name,"directory"))
{
- #ifdef WIN32
- struct stat info = {0};
- if(stat(optarg, &info) || !S_ISDIR(info.st_mode))
- {
- ERROR1("%s is not a directory",optarg);
- exit_code = ENOTDIR;
- return -1;
- }
-
- #else
char* path ;
if(translatepath(optarg, &path) < 0)
{
exit_code = errno;
+ err_kind = 0;
if(ENOTDIR == errno)
ERROR1("%s is not a directory",optarg);
return -1;
}
- #endif
else
{
char* buffer = getcwd(NULL, 0);
- #ifdef WIN32
-
- if(!strcmp(buffer, optarg))
- WARN1("Already in the directory %s", optarg);
- else if(!print_directory_flag)
- INFO1("Entering directory \"%s\"",optarg);
-
- chdir(optarg);
- #else
if(!strcmp(buffer, path))
WARN1("Already in the directory %s", optarg);
chdir(path);
free(path);
- #endif
-
+
free(buffer);
-
-
}
}
if(strlen(optarg) > MAX_SUFFIX)
{
ERROR1("Suffix %s too long",optarg);
- exit_code = ESUFFIXTOOLONG;
+ exit_code = ESUFFIXTOOLONG;
+ err_kind = 1;
return -1;
}
unsigned int i;
int exists = 0;
- char suffix[MAX_SUFFIX + 2] = {0};
+ char* suffix = xbt_new0(char, MAX_SUFFIX + 2);
sprintf(suffix,".%s",optarg);
xbt_dynar_foreach(suffixes, i, cur)
if(exists)
WARN1("Suffix %s already specified to be used", optarg);
else
- xbt_dynar_push(suffixes, &optarg);
+ {
+ char* suffix = strdup(optarg);
+ xbt_dynar_push(suffixes, &suffix);
+ }
}
}
/* --file option */
if(getpath(optarg, &path) < 0)
{
exit_code = errno;
+ err_kind = 0;
if(ENOENT == errno)
ERROR1("File %s does not exist", optarg);
else
- ERROR0("Insufficient memory is available to process the command line - system error");
+ ERROR1("System error :`(%s)'", strerror(errno));
return -1;
}
delimiter = strrchr(optarg,'/');
+
+ #ifdef WIN32
+ if(!delimiter)
+ delimiter = strrchr(optarg,'\\');
+ #endif
fstream = fstream_new(path, delimiter ? delimiter + 1 : optarg);
/* --include-dir option */
else if(!strcmp(entry->long_name,"include-dir"))
{
- #ifdef WIN32
- struct stat info = {0};
- if(stat(optarg, &info) || !S_ISDIR(info.st_mode))
- {
- ERROR1("%s is not a directory",optarg);
- exit_code = ENOTDIR;
- return -1;
- }
-
- #else
+
char* path ;
if(translatepath(optarg, &path) < 0)
{
exit_code = errno;
+ err_kind = 0;
if(ENOTDIR == errno)
ERROR1("%s is not a directory",optarg);
return -1;
}
- #endif
+
else
{
int exists = 0;
unsigned int i;
directory_t cur;
- #ifdef WIN32
- directory = directory_new(optarg);
- #else
directory = directory_new(path);
free(path);
- #endif
xbt_dynar_foreach(include_dirs, i , cur)
{
if(getpath(optarg, &path) < 0)
{
exit_code = errno;
+ err_kind = 0;
if(ENOENT == errno)
ERROR1("file %s does not exist", optarg);
}
delimiter = strrchr(optarg,'/');
+
+ #ifdef WIN32
+ if(!delimiter)
+ delimiter = strrchr(optarg,'\\');
+ #endif
fstream = fstream_new(path, delimiter ? delimiter + 1 : optarg);
free(path);
excludes_add(excludes, fstream);
}
- /* --log option */
else if(!strcmp(entry->long_name,"log"))
{
- xbt_dynar_push(logs, &optarg);
+ /* NOTHING TODO : log for xbt */
}
else
{
{
ERROR2("Option %c \"%s\" requires an strictly positive integer as argument",entry->c, entry->long_name);
exit_code = ENOTPOSITIVENUM;
+ err_kind = 1;
return -1;
}
else
FILE* stream;
stream = exit_code ? stderr : stdout;
+
+ if(!screen_cleaned)
+ {
+ #ifdef WIN32
+ system("cls");
+ #else
+ system("clear");
+ #endif
+ screen_cleaned = 1;
+ }
fprintf (stream, "Usage: tesh [options] [file] ...\n");
static void
print_version(void)
{
+ if(!screen_cleaned)
+ {
+ #ifdef WIN32
+ system("cls");
+ #else
+ system("clear");
+ #endif
+ screen_cleaned = 1;
+ }
+
/* TODO : display the version of tesh */
printf("Version :\n");
printf(" tesh version %s : Mini shell specialized in running test units by Martin Quinson \n", version);
size_t len;
char * line = NULL;
- FILE* stream = fopen("README.txt", "r");
+ FILE* stream = fopen("examples/README.tesh", "r");
if(!stream)
{
ERROR0("Unable to locate the README.txt file");
exit_code = EREADMENOTFOUND;
+ err_kind = 1;
return;
}
